Commit eaa80e1f authored by cy's avatar cy

vip方案查询修改参数类型

parent ef8e213d
...@@ -383,8 +383,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -383,8 +383,8 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
} }
//综合成绩区间 //综合成绩区间
Integer totalMax = schemeVo.getTotalMax(); double totalMax = schemeVo.getTotalMax();
Integer totalMin = schemeVo.getTotalMin(); double totalMin = schemeVo.getTotalMin();
//地区 //地区
List<String> locals = StringUtil.strToArrayStr(schemeVo.getLocal()); List<String> locals = StringUtil.strToArrayStr(schemeVo.getLocal());
...@@ -569,7 +569,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -569,7 +569,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
* @param professionNames 专业名称 * @param professionNames 专业名称
* @return vip文化生志愿列表 * @return vip文化生志愿列表
*/ */
private List<Volunteer> getCultureVipList(AdmissionRule firstRule, double cultureGrade, Integer totalMax, Integer totalMin, private List<Volunteer> getCultureVipList(AdmissionRule firstRule, double cultureGrade, double totalMax, double totalMin,
List<String> locals, List<String> professionNames, List<String> classNames, String gradeType) { List<String> locals, List<String> professionNames, List<String> classNames, String gradeType) {
double cultureMax = firstRule.getCultureMax(); double cultureMax = firstRule.getCultureMax();
double cultureMin = firstRule.getCultureMin(); double cultureMin = firstRule.getCultureMin();
...@@ -604,7 +604,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -604,7 +604,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
* @param professionNames 专业名称 * @param professionNames 专业名称
* @return 志愿方案列表 * @return 志愿方案列表
*/ */
private List<Volunteer> getArtsVipList(AdmissionRule firstRule, double cultureGrade, double majorGrade, Integer totalMax, Integer totalMin, List<String> locals, private List<Volunteer> getArtsVipList(AdmissionRule firstRule, double cultureGrade, double majorGrade, double totalMax, double totalMin, List<String> locals,
List<String> professionNames, List<String> classNames, String gradeType) { List<String> professionNames, List<String> classNames, String gradeType) {
Map<String, Object> map = new HashMap<>(16); Map<String, Object> map = new HashMap<>(16);
map.put("professionNames", professionNames); map.put("professionNames", professionNames);
...@@ -636,7 +636,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -636,7 +636,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
* @param professionNames 专业名称 * @param professionNames 专业名称
* @return 志愿方案列表 * @return 志愿方案列表
*/ */
private List<Volunteer> getLiteratureVipList(AdmissionRule firstRule, double cultureGrade, double majorGrade, Integer totalMax, Integer totalMin, List<String> locals, private List<Volunteer> getLiteratureVipList(AdmissionRule firstRule, double cultureGrade, double majorGrade, double totalMax, double totalMin, List<String> locals,
List<String> professionNames, List<String> classNames, String gradeType) { List<String> professionNames, List<String> classNames, String gradeType) {
Map<String, Object> map = new HashMap<>(16); Map<String, Object> map = new HashMap<>(16);
map.put("professionNames", professionNames); map.put("professionNames", professionNames);
...@@ -671,7 +671,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp ...@@ -671,7 +671,7 @@ public class SchemeServiceImpl extends ServiceImpl<SchemeMapper, SchemeInfo> imp
* @param professionNames 专业名称 * @param professionNames 专业名称
* @return 志愿方案列表 * @return 志愿方案列表
*/ */
private List<Volunteer> getSportsVipList(AdmissionRule firstRule, double cultureGrade, double majorGrade, Integer totalMax, Integer totalMin, List<String> locals, private List<Volunteer> getSportsVipList(AdmissionRule firstRule, double cultureGrade, double majorGrade, double totalMax, double totalMin, List<String> locals,
List<String> professionNames, List<String> classNames, String gradeType) { List<String> professionNames, List<String> classNames, String gradeType) {
Map<String, Object> map = new HashMap<>(16); Map<String, Object> map = new HashMap<>(16);
map.put("professionNames", professionNames); map.put("professionNames", professionNames);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment