Commit 2d022282 authored by Wzp's avatar Wzp

添加分数限制/api/school/matchSchoolList

parent 2a5c988d
...@@ -1142,6 +1142,16 @@ public class MallSchoolServiceImpl implements IMallSchoolService { ...@@ -1142,6 +1142,16 @@ public class MallSchoolServiceImpl implements IMallSchoolService {
// List<MallSchoolTag> allTag = mallSchoolTagMapper.selectTagList(); // List<MallSchoolTag> allTag = mallSchoolTagMapper.selectTagList();
// 学校录取率计算 // 学校录取率计算
try { try {
boolean flag = false;
if (subjectType.equals("0") && majorScore >= 193 && cultureScore >= 331){
flag = true;
}else if (subjectType.equals("1") && majorScore >= 193 && cultureScore >= 328){
flag = true;
}
boolean finalFlag = flag;
CountDownLatch countDownLatch = new CountDownLatch(schoolVOS.size()); CountDownLatch countDownLatch = new CountDownLatch(schoolVOS.size());
for (SchoolVO schoolVO : schoolVOS) { for (SchoolVO schoolVO : schoolVOS) {
...@@ -1161,7 +1171,7 @@ public class MallSchoolServiceImpl implements IMallSchoolService { ...@@ -1161,7 +1171,7 @@ public class MallSchoolServiceImpl implements IMallSchoolService {
result.put("acceptRate", BigDecimal.ZERO); result.put("acceptRate", BigDecimal.ZERO);
result.put("rateType", -2); result.put("rateType", -2);
} }
} else { } else if (finalFlag){
// 本科 // 本科
mallSchoolAccept = mallSchoolAcceptMapper.selectMinReferenceBySchoolId(schoolVO.getSchoolId(), batchId, subjectType); mallSchoolAccept = mallSchoolAcceptMapper.selectMinReferenceBySchoolId(schoolVO.getSchoolId(), batchId, subjectType);
// 计算 // 计算
...@@ -1171,6 +1181,9 @@ public class MallSchoolServiceImpl implements IMallSchoolService { ...@@ -1171,6 +1181,9 @@ public class MallSchoolServiceImpl implements IMallSchoolService {
result.put("acceptRate", "0"); result.put("acceptRate", "0");
result.put("rateType", -2); result.put("rateType", -2);
} }
}else {
result.put("acceptRate", "0");
result.put("rateType", -2);
} }
......
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