优化方案查询 2

wisenergy-model/src/main/java/cn/wisenergy/model/vo/VolunteerVo.java

@@ -9,22 +9,28 @@ import java.util.Date;
 import java.util.List;
 
 /**
-*@ Description: 方案查询志愿列表
-*@ Author     : 86187
-*@ Date       : 2021/1/13 14:57
-*/
+ * @ Description: 方案查询志愿列表
+ * @ Author     : 86187
+ * @ Date       : 2021/1/13 14:57
+ */
 @Data
 @ApiModel(value = "VolunteerVo")
 public class VolunteerVo {
     /**
      * 用户id
      */
-    @ApiModelProperty(value = "用户id",name = "userId")
+    @ApiModelProperty(value = "用户id", name = "userId")
     private Integer userId;
 
+    /**
+     * 方案记录id
+     */
+    @ApiModelProperty(value = "方案记录id", name = "recordId")
+    private Integer recordId;
+
     /**
      * 志愿信息列表
      */
-    @ApiModelProperty(value = "志愿信息列表",name = "volunteers")
+    @ApiModelProperty(value = "志愿信息列表", name = "volunteers")
     private List<Volunteer> volunteers;
 }

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

@@ -241,15 +241,17 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             list = getVolunteerList(list, totalResult);
         }
 
-//        //6保存用户方案记录、志愿之间的关联关系,扣减查询次数
-//        boolean bool = volunteerManager.saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
-//        if (!bool) {
-//            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());
         volunteerVo.setVolunteers(list);
         return R.ok(volunteerVo);
     }

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

@@ -172,7 +172,7 @@ public class VolunteerManager {
      * @return true 成功  false 失败
      */
     @Transactional(rollbackFor = Exception.class)
-    public boolean saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo, String name) {
+    public R<Integer> saveUserVolunteer(User user, List<Volunteer> list, ScoreInfo scoreInfo, String name) {
         //1、保存方案查询记录
         SchemeQueryRecord schemeQueryRecord = new SchemeQueryRecord();
         schemeQueryRecord.setMajorName(name);
@@ -186,7 +186,7 @@ public class VolunteerManager {
         //保存方案查询记录
         int count = schemeRecordMapper.add(schemeQueryRecord);
         if (count == 0) {
-            return false;
+            return R.error("保存方案查询记录失败!");
         }
 
         List<UserVolunteer> volunteerList = new ArrayList<>();
@@ -201,13 +201,15 @@ public class VolunteerManager {
         //调用扣减查询次数接口
         R<Boolean> result = userLimitService.minusLimit(user.getId());
         if (null != result && result.getCode() == ERROR_CODE) {
-            return false;
+            return R.error("扣减查询次数失败!");
         }
+
+        //保存方案志愿关联关系
         boolean bool = userVolunteerService.saveBatch(volunteerList);
         if (!bool) {
-            return false;
+            return R.error("保存方案志愿关联关系失败!");
         }
-        return true;
+        return R.ok(schemeQueryRecord.getId());
     }
 
     /**