修改最低分字段为double

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

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

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

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

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

@@ -139,7 +139,7 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
         log.info("volunteer-service[]SchemeRecordServiceImpl[]export[]input.param.userId,recordId:" + userId);
 
         //查询时间
-        String format=null;
+        String format = null;
 
         if (null == userId || null == recordId) {
             return R.error("入参为空!");
@@ -147,7 +147,7 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
 
         //获取用户信息
         User byId = usersMapper.getById(userId);
-        String name=byId.getUserName();
+        String name = byId.getUserName();
 
         //1、根据用户id和方案记录id,获取志愿ids
         QueryWrapper<UserVolunteer> queryWrapper = new QueryWrapper<>();
@@ -160,10 +160,10 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
         }
 
         //获取方案查询时间
-        if (null!=schemeQueryRecord) {
-             format = DateUtil.convertDateToStr(schemeQueryRecord.getUpdateTime(), "yyyy-MM-dd HH:mm:SS");
-        }else {
-             format = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd HH:mm:SS");
+        if (null != schemeQueryRecord) {
+            format = DateUtil.convertDateToStr(schemeQueryRecord.getUpdateTime(), "yyyy-MM-dd HH:mm:SS");
+        } else {
+            format = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd HH:mm:SS");
         }
 
 
@@ -187,7 +187,7 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
 
             // 4.向文档中添加内容
             PdfUtil pdfUtil = new PdfUtil();
-            pdfUtil.generatePDF(document, result,name,format);
+            pdfUtil.generatePDF(document, result, name, format);
 
             // 5.关闭文档
             document.close();
@@ -216,10 +216,10 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
 
     @Override
     public R<Boolean> createExcel(Integer userId, Integer recordId, HttpServletResponse response) {
-        log.info("SchemeRecordServiceImpl[].createExcel[].input.param:userId,recordId"+userId,recordId);
+        log.info("SchemeRecordServiceImpl[].createExcel[].input.param:userId,recordId" + userId, recordId);
 
         //查询时间
-        String format=null;
+        String format = null;
 
         if (null == userId || null == recordId) {
             return R.error("入参为空!");
@@ -228,10 +228,10 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
         //获取用户信息
         User byId = usersMapper.getById(userId);
 
-        if (null==byId) {
+        if (null == byId) {
             return R.error("该用户不存在");
         }
-        String name=byId.getUserName();
+        String name = byId.getUserName();
 
         //1、根据用户id和方案记录id,获取志愿ids
         QueryWrapper<UserVolunteer> queryWrapper = new QueryWrapper<>();
@@ -244,9 +244,9 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
         }
 
         //获取方案查询时间
-        if (null!=schemeQueryRecord) {
+        if (null != schemeQueryRecord) {
             format = DateUtil.convertDateToStr(schemeQueryRecord.getUpdateTime(), "yyyy-MM-dd HH:mm:SS");
-        }else {
+        } else {
             format = DateUtil.convertDateToStr(new Date(), "yyyy-MM-dd HH:mm:SS");
         }
         List<Integer> ids = list.stream().map(UserVolunteer::getVolunteerId).collect(Collectors.toList());
@@ -269,10 +269,10 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
                                 .nature(t.getNature())
                                 .yearLimit(t.getYearLimit())
                                 .planNum(t.getPlanNum())
-                                .castArchivesNum(null==t.getCastArchivesNum()?0:t.getCastArchivesNum())
-                                .launchNum(null==t.getLaunchNum()?0:t.getLaunchNum())
-                                .lowestMark(null==t.getLowestMark()?String.valueOf(0):t.getLowestMark())
-                                .lowestRank(null==t.getLowestRank()?String.valueOf(0):t.getLowestRank())
+                                .castArchivesNum(null == t.getCastArchivesNum() ? 0 : t.getCastArchivesNum())
+                                .launchNum(null == t.getLaunchNum() ? 0 : t.getLaunchNum())
+                                .lowestMark(null == t.getLowestMark() ? 0 : t.getLowestMark())
+                                .lowestRank(null == t.getLowestRank() ? String.valueOf(0) : t.getLowestRank())
                                 .build();
                     }).collect(Collectors.toList());
 
@@ -283,9 +283,9 @@ public class SchemeRecordServiceImpl extends ServiceImpl<SchemeRecordMapper, Sch
 
             //  sheet名称
             EasyExcel.write(response.getOutputStream(), VolunteerDto.class).sheet(lon.toString()).doWrite(resultBo);
-            return R.ok(0,true);
+            return R.ok(0, true);
         } catch (Exception e) {
-            return R.ok(1,false);
+            return R.ok(1, false);
         }
     }
 

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

@@ -1045,10 +1045,10 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         List<Volunteer> otherList = new ArrayList<>();
 
         //分组，每组数量大于2的，取两条，小于等于则全取
-        Map<String, List<Volunteer>> map = list.stream().collect(Collectors.groupingBy(Volunteer::getLowestMark
+        Map<Double, List<Volunteer>> map = list.stream().collect(Collectors.groupingBy(Volunteer::getLowestMark
         ));
 
-        for (Map.Entry<String, List<Volunteer>> entry : map.entrySet()) {
+        for (Map.Entry<Double, List<Volunteer>> entry : map.entrySet()) {
             List<Volunteer> volunteers = entry.getValue();
             if (volunteers.size() > 2) {
                 for (int i = 0; i < 2; i++) {

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

@@ -151,7 +151,7 @@ public class VolunteerServiceImpl extends ServiceImpl<VolunteerMapper, Volunteer
                     .planNum(2 + i)
                     .castArchivesNum(3 + i)
                     .launchNum(4 + i)
-                    .lowestMark("600" + i * 10)
+                    .lowestMark(600.00 + i * 10)
                     .lowestRank("100" + i * 10)
                     .build();
             residents.add(volunteer);

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

@@ -72,7 +72,7 @@ public class PdfUtil implements Serializable {
             table.addCell(createCell(volunteer.getPlanNum().toString(), textfont));
             table.addCell(createCell(null==volunteer.getCastArchivesNum()?"":volunteer.getCastArchivesNum().toString(), textfont));
             table.addCell(createCell(null==volunteer.getLaunchNum()?"":volunteer.getLaunchNum().toString(), textfont));
-            table.addCell(createCell(null==volunteer.getLowestMark()?"":volunteer.getLowestMark(), textfont));
+            table.addCell(createCell(null==volunteer.getLowestMark()?"":volunteer.getLowestMark().toString(), textfont));
             table.addCell(createCell(null==volunteer.getLowestRank()?"":volunteer.getLowestRank(), textfont));
         }
         document.add(table);