新增excel模板接口

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

@@ -19,7 +19,7 @@ public class RefillCard {
      * 批次号
      */
     @ApiModelProperty(value = "批次号",name = "batchNumber")
-    private String isActivate;
+    private String batchNumber;
 
     /**
      * 是否已制卡 0：已制卡 1：未制卡

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

@@ -38,7 +38,7 @@ public class Volunteer  implements Serializable {
      * 方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文学编导 4：本科体育  5：专科专业分类6：专科美术一批 7：专科文学编导一批 8：专科体育一批
      */
     @ApiModelProperty(value = "方案类型：1：本科文化一批 2：本科美术一批 3：艺术本科批文学编导 4：本科体育  " +
-            "5：专科专业分类6：专科美术一批 7：专科文学编导一批 8：专科体育一批", name = "type")
+            "5：专科专业分类 6：专科美术一批 7：专科文学编导一批 8：专科体育一批", name = "type")
     private Integer type;
 
     /**

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

@@ -241,17 +241,17 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             list = getVolunteerList(list, totalResult);
         }
 
-        //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
-        R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
-        if (null != bool && bool.getCode() == 500) {
-            return R.error("保存方案查询记录失败!");
-        }
+//        //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
+//        R<Integer> bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
+//        if (null != bool && bool.getCode() == 500) {
+//            return R.error("保存方案查询记录失败!");
+//        }
 
         //排序
         list.sort(Comparator.comparing(Volunteer::getLowestMark).reversed());
         volunteerVo.setUserId(user.getId());
-        assert bool != null;
-        volunteerVo.setRecordId(bool.getData());
+//        assert bool != null;
+//        volunteerVo.setRecordId(bool.getData());
         volunteerVo.setVolunteers(list);
         volunteerVo.setTotal(list.size());
         return R.ok(volunteerVo);