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

updates

This commit is contained in:
zhouwentao 2025-06-06 19:44:54 +08:00
parent 03c7977496
commit 0790b6ce9d
1 changed files with 13 additions and 2 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

@ -216,10 +216,10 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
public Result<?> insertNewMajorList() { public Result<?> insertNewMajorList() {
LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxHistoryMajorEnroll> helqw = new LambdaQueryWrapper<>();
helqw.eq(YxHistoryMajorEnroll::getYear,"2024"); helqw.eq(YxHistoryMajorEnroll::getYear,"2024");
helqw.eq(YxHistoryMajorEnroll::getMajorType,"体育类"); helqw.eq(YxHistoryMajorEnroll::getMajorType,"播音与主持类");
List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw); List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(helqw);
LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<YxSchoolMajor> smlqw = new LambdaQueryWrapper<>();
smlqw.eq(YxSchoolMajor::getMajorType,"体育类"); smlqw.eq(YxSchoolMajor::getMajorType,"播音与主持类");
List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw); List<YxSchoolMajor> yxSchoolMajorList = yxSchoolMajorService.list(smlqw);
Map<String ,YxSchoolMajor> map = new HashMap<>(); Map<String ,YxSchoolMajor> map = new HashMap<>();
String key = ""; String key = "";
@ -515,6 +515,17 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
AssertUtils.notNull(major, String.format("行[%s],专业未在系统中找到", index)); AssertUtils.notNull(major, String.format("行[%s],专业未在系统中找到", index));
yxHistoryMajorEnroll.setMajorCode(major.getMajorCode()); yxHistoryMajorEnroll.setMajorCode(major.getMajorCode());
if(enrollmentCode.length() == 1){
enrollmentCode = "0" + enrollmentCode;
}
if(schoolCode.length() == 3){
schoolCode = "0" + schoolCode;
}else if(schoolCode.length() == 2){
schoolCode = "00" + schoolCode;
}else if(schoolCode.length() == 1){
schoolCode = "000" + schoolCode;
}
if ("提前批".equals(batch)) { if ("提前批".equals(batch)) {
batch = "本科提前批"; batch = "本科提前批";