yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-06-20 12:01:15 +08:00
parent ea7bffc60c
commit 06225b5672
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxHistoryMajorEnrollController.java
View File

@ -248,22 +248,17 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
queryWrapper.apply("control_line > admission_line") queryWrapper.apply("control_line > admission_line")
.gt(YxHistoryMajorEnroll::getAdmissionLine, 1); .gt(YxHistoryMajorEnroll::getAdmissionLine, 1);
List<YxHistoryMajorEnroll> historyMajorEnrollList = yxHistoryMajorEnrollService.list(queryWrapper); List<YxHistoryMajorEnroll> historyMajorEnrollList = yxHistoryMajorEnrollService.list(queryWrapper);
dataList = historyMajorEnrollList;
List<YxSchoolMajor> schoolMajorList1 = yxSchoolMajorService.list(new LambdaQueryWrapper<YxSchoolMajor>()); List<YxSchoolMajor> schoolMajorList1 = yxSchoolMajorService.list(new LambdaQueryWrapper<YxSchoolMajor>());
Map<String,YxSchoolMajor> map1 =new LinkedHashMap<>(); Map<String,YxSchoolMajor> map1 =new LinkedHashMap<>();
for (YxSchoolMajor y : schoolMajorList1) { for (YxSchoolMajor y : schoolMajorList1) {
map1.put(y.getSchoolCode()+"_"+y.getEnrollmentCode()+"_"+y.getMajorType()+"_"+y.getCategory(),y); map1.put(y.getSchoolCode()+"_"+y.getMajorType()+"_"+y.getCategory(),y);
} }
for (YxHistoryMajorEnroll y : dataList) { for (YxHistoryMajorEnroll y : historyMajorEnrollList) {
YxSchoolMajor yxSchoolMajor = map1.get(y.getSchoolCode() + "_" + y.getEnrollmentCode() + "_" + y.getMajorType() + "_" + y.getCategory()); YxSchoolMajor yxSchoolMajor = map1.get(y.getSchoolCode() + "_" + y.getMajorType() + "_" + y.getCategory());
if (yxSchoolMajor!=null) { if (yxSchoolMajor!=null) {
if(yxSchoolMajor.getTuition()!=null){ continue;
y.setTuition(yxSchoolMajor.getTuition().toString());
}
if(StringUtils.isNotBlank(yxSchoolMajor.getDetail())){
y.setDetail(yxSchoolMajor.getDetail());
}
} }
dataList.add(y);
} }
if(false){ if(false){

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxVolunteerRecordServiceImpl.java
View File

@ -84,11 +84,7 @@ public class YxVolunteerRecordServiceImpl extends ServiceImpl<YxVolunteerRecordM
String key = majorCode+schoolCode+enrollmentCode+category; String key = majorCode+schoolCode+enrollmentCode+category;
//判断这个批次段的是否已填满 //判断这个批次段的是否已填满
long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count(); long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count();
// if ("体育类".equals(majorType)) { AssertUtils.notTrue(count>=35,"高职高专仅可以填报三十五个志愿");
// AssertUtils.notTrue(count>=35,batch+"仅可以填报三十五个志愿");
// }else{
// }
AssertUtils.notTrue(count>=35,batch+"仅可以填报三十五个志愿");
}else if(YxConstant.batchList1.contains(batch)){ }else if(YxConstant.batchList1.contains(batch)){
//本科批 //本科批
yxVolunteerRecordLambdaQueryWrapper.in(YxVolunteerRecord::getBatch,YxConstant.batchList1); yxVolunteerRecordLambdaQueryWrapper.in(YxVolunteerRecord::getBatch,YxConstant.batchList1);
@ -97,7 +93,7 @@ public class YxVolunteerRecordServiceImpl extends ServiceImpl<YxVolunteerRecordM
String key = majorCode+schoolCode+enrollmentCode+category; String key = majorCode+schoolCode+enrollmentCode+category;
//判断这个批次段的是否已填满 //判断这个批次段的是否已填满
long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count(); long count = list.stream().filter(l -> !(l.getMajorCode()+l.getSchoolCode()+l.getEnrollmentCode()+l.getCategory()).equals(key)).count();
AssertUtils.notTrue(count>=35,batch+"仅可以填报三十五个志愿"); AssertUtils.notTrue(count>=35,"本科批仅可以填报三十五个志愿");
} }
//循环已填报专业，与当前专业对比是否一致 //循环已填报专业，与当前专业对比是否一致