优化查询方案

wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml

@@ -153,6 +153,9 @@
             <if test="downGrade != null">
                 and lowest_mark >#{downGrade}
             </if>
+            <if test="type != null">
+                and type =#{type}
+            </if>
             <if test="classNames != null">
                 and
                 <foreach collection="classNames" index="index" item="id" separator="or" open="(" close=")">

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

@@ -246,17 +246,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);