修改查询方案（专科体育）

wisenergy-service/src/main/java/cn/wisenergy/service/app/VolunteerService.java

@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.SchemeInfo;
 import cn.wisenergy.model.app.Volunteer;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -46,5 +47,4 @@ public interface VolunteerService extends IService<Volunteer> {
      * @throws IOException 异常
      */
     void ceshi(MultipartFile file, HttpServletResponse response) throws IOException;
-
 }

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

@@ -600,23 +600,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
 
         //2、考生是否能报取体育专科
         if (total >= secondRule.getCultureMin()) {
-            //浮动分数
-            double upGrade = total + secondRule.getUpMark();
-            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,
-                        SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
-                list.addAll(fillList);
-            }
+            list = volunteerMapper.getVolunteerByType(SchemeTypeEnums.JUNIOR_COLLEGE_SPORTS.getCode());
         }
 
         return list;

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SchemeController.java

@@ -3,6 +3,7 @@ package cn.wisenergy.web.admin.controller.app;
 import cn.wisenergy.common.expection.BaseException;
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.SchemeInfo;
+import cn.wisenergy.model.app.Volunteer;
 import cn.wisenergy.model.vo.SchemeQueryVo;
 import cn.wisenergy.model.vo.SchemeVo;
 import cn.wisenergy.model.vo.VolunteerVo;