修改方案接口

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

@@ -555,23 +555,41 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
         if (total >= firstRule.getCultureMin()) {
             //浮动分数
             double upGrade = total + firstRule.getUpMark();
-            double downGrade = total + firstRule.getDownMark();
+            double downGrade = total - firstRule.getDownMark();
+            if (downGrade < firstRule.getCultureMin()) {
+                downGrade = firstRule.getCultureMin();
+            }
             map.put("upGrade", upGrade);
             map.put("downGrade", downGrade);
             map.put("type", SchemeTypeEnums.UNDERGRADUATE_SPORTS.getCode());
             list = volunteerMapper.getVolunteerList(map);
 
+            //如果数据不满足最大数量，取不限专业最低分补充
+            if (list.size() < secondRule.getNumber()) {
+                List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade);
+                list.addAll(fillList);
+            }
+            return list;
         }
 
         //2、考生是否能报取体育专科
         if (total >= secondRule.getCultureMin()) {
             //浮动分数
             double upGrade = total + secondRule.getUpMark();
-            double downGrade = total + secondRule.getDownMark();
+            double downGrade = total - secondRule.getDownMark();
+            if (downGrade < secondRule.getCultureMin()) {
+                downGrade = secondRule.getCultureMin();
+            }
             map.put("upGrade", upGrade);
             map.put("downGrade", downGrade);
             map.put("type", SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
             list = volunteerMapper.getVolunteerList(map);
+
+            //如果数据不满足最大数量，取不限专业最低分补充
+            if (list.size() < secondRule.getNumber()) {
+                List<Volunteer> fillList = fillUpVolunteer(list, secondRule.getNumber(), upGrade, downGrade);
+                list.addAll(fillList);
+            }
         }
 
         return list;