修改查询接口

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

@@ -163,7 +163,6 @@
                 </foreach>
             </if>
             order by lowest_mark desc
-            limit #{number}
         </where>
     </select>
 

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

@@ -7,10 +7,10 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
+ * @author 86187
  * @ Description: 方案查询Vo
  * @ Author     : 86187
  * @ Date       : 2021/1/13 14:53
- * @author 86187
  */
 @Data
 @ApiModel(value = "SchemeQueryVo")
@@ -48,5 +48,11 @@ public class SchemeVo implements Serializable {
     @ApiModelProperty(value = "专业课成绩", name = "majorGrade")
     private String majorGrade;
 
+    /**
+     * 是否展示全部  0:否  1：是
+     */
+    @ApiModelProperty(value = "是否展示全部  0:否  1：是", name = "isShowAll")
+    private Integer isShowAll;
+
 
 }

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

@@ -88,7 +88,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             return R.error("无考生成绩!");
         }
 
-
         //3、根据筛选方案算法，筛选方案
         //副科名称
         List<String> className = getClassName(scoreInfo);
@@ -103,6 +102,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         }
 
         //(1)判断考生类型 文化课考生
+        //初始化返回数据总条数
+        int totalResult = 0;
         List<Volunteer> list = new ArrayList<>();
         VolunteerVo volunteerVo = new VolunteerVo();
         if (StudentType.CULTURE_STUDENT.getCode().equals(user.getExamType())) {
@@ -136,6 +137,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
                 return R.error("很抱歉，您的成绩不满足报考条件，无法查询!");
             }
 
+            totalResult = firstRule.getNumber();
             list = getCultureList(scoreInfo, firstRule, secondRule, className, professionName, firstCulture, secondCulture);
         }
 
@@ -159,6 +161,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             if (secondMajor < secondRule.getProfessionMin()) {
                 return R.error("很抱歉，您的成绩不满足报考条件，无法查询!");
             }
+
+            totalResult = firstRule.getNumber();
             list = getArtsList(scoreInfo, firstRule, secondRule, className, professionName);
         }
 
@@ -182,6 +186,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             if (secondMajor < secondRule.getProfessionMin()) {
                 return R.error("很抱歉，您的专业成绩不满足报考条件，无法查询!");
             }
+
+            totalResult = firstRule.getNumber();
             list = getLiteratureList(scoreInfo, firstRule, secondRule, className, professionName);
         }
 
@@ -210,10 +216,25 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
             if (total < secondRule.getProfessionMin()) {
                 return R.error("很抱歉，您的成绩不满足报考条件，无法查询!");
             }
+
+            totalResult = firstRule.getNumber();
             list = getSportsList(total, firstRule, secondRule, className, professionName);
         }
 
-        //4保存用户方案记录、志愿之间的关联关系
+        //4判断是否展示全部方案
+        if (queryVo.getIsShowAll() == 0) {
+            List<Volunteer> result = list.subList(0, 10);
+            volunteerVo.setUserId(user.getId());
+            volunteerVo.setVolunteers(result);
+            return R.ok(volunteerVo);
+        }
+
+        //5、判断返回的结果数据是否大于totalResult
+        if (list.size() > totalResult) {
+            list = getVolunteerList(list, totalResult);
+        }
+
+        //6保存用户方案记录、志愿之间的关联关系
         boolean bool = saveUserVolunteer(user, list, scoreInfo, queryVo.getBigMajorNames());
         if (!bool) {
             return R.error("保存方案查询记录失败!");
@@ -345,7 +366,6 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         //考生的分数在本科一批中
         List<Volunteer> list = new ArrayList<>();
         Map<String, Object> map = new HashMap<>(16);
-        map.put("number", firstRule.getNumber());
         map.put("classNames", classNames);
         map.put("professionNames", professionNames);
         if (firstCulture < cultureMax && firstCulture > cultureMin) {
@@ -656,4 +676,15 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         schemeVo.setPageNo(pageNum);
         schemeVo.setPageSize(pageSize);
     }
+
+
+    private List<Volunteer> getVolunteerList(List<Volunteer> list, Integer total) {
+        List<Volunteer> result = new ArrayList<>();
+        List<Volunteer> otherList = new ArrayList<>();
+        for (Volunteer volunteer : list) {
+
+        }
+
+        return result;
+    }
 }