方案导出格式修改

wisenergy-model/src/main/java/cn/wisenergy/model/app/Volunteer.java

@@ -108,8 +108,8 @@ public class Volunteer  implements Serializable {
     /**
      * 最低分
      */
-    @ApiModelProperty(value = "最低分", name = "lowestMark")
-    @ExcelProperty(value = "最低分")
+    @ApiModelProperty(value = "参考分", name = "lowestMark")
+    @ExcelProperty(value = "参考分")
     private String lowestMark;
 
     /**

wisenergy-model/src/main/java/cn/wisenergy/model/dto/VolunteerDto.java

@@ -102,8 +102,8 @@ public class VolunteerDto implements Serializable {
     /**
      * 最低分
      */
-    @ApiModelProperty(value = "最低分", name = "lowestMark")
-    @ExcelProperty(value = "最低分")
+    @ApiModelProperty(value = "参考分", name = "lowestMark")
+    @ExcelProperty(value = "参考分")
     private String lowestMark;
 
     /**

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/StaffUserVipServiceImpl.java

@@ -262,6 +262,7 @@ public class StaffUserVipServiceImpl extends ServiceImpl<LocalMapper, Local> imp
             return R.error("该员工不存在");
         }
         String staffName=byId.getStaffName();
+
         //生成Excel
         try {
             //  设置内容格式 以及 编码方式

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

@@ -328,6 +328,7 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
                                 .lastLoginTime(t.getLastLoginTime())
                                 .cultureGrade(t.getCultureGrade())
                                 .majorGrade(t.getMajorGrade())
+                                .queryLimit(t.getQueryLimit())
                                 .build();
                     }).collect(Collectors.toList());
 
@@ -424,3 +425,4 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         return R.ok(userInfoVo);
     }
 }
+

wisenergy-service/src/main/java/cn/wisenergy/service/common/PdfUtil.java

@@ -59,7 +59,7 @@ public class PdfUtil implements Serializable {
         table.addCell(createCell("计划数", keyfont, Element.ALIGN_CENTER));
         table.addCell(createCell("投档计划数", keyfont, Element.ALIGN_CENTER));
         table.addCell(createCell("投出数", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("最低分", keyfont, Element.ALIGN_CENTER));
+        table.addCell(createCell("参考分", keyfont, Element.ALIGN_CENTER));
         table.addCell(createCell("最低位次", keyfont, Element.ALIGN_CENTER));
         for (Volunteer volunteer : list)
             {

wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java

@@ -341,6 +341,7 @@ public class VolunteerManager {
         staffUserVip.setUserVipId(user.getId());
         staffUserVip.setIsDelete(0);
         int add = staffUserVipMapper.add(staffUserVip);
+
         //判断数据是否添加成功
         if (add==0) {
             return false;
@@ -515,6 +516,6 @@ public class VolunteerManager {
         UserInfoVo userInfoVo = new UserInfoVo();
         userInfoVo.setUserId(userInfo.getId());
         userInfoVo.setPhone(userInfo.getPhone());
-        return R.ok(userInfoVo);
+        return R.ok(0,userInfoVo);
     }
 }