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-22 10:00:28 +08:00
parent 62cc9b1166
commit 47ad428ac8
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -125,8 +125,15 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
String schoolCode = yxSchoolMajor.getSchoolCode();
AssertUtils.notEmpty(schoolCode, "请选择[学校]!");
AssertUtils.notEmpty(majorCode, "请选择[专业]!");
AssertUtils.notNull(yxSchoolMajor.getTuition(), "请输入[学费]!");
AssertUtils.notEmpty(yxSchoolMajor.getMajorName(), "请输入[专业名称]!");
//AssertUtils.notNull(yxSchoolMajor.getTuition(), "请输入[学费]!");
AssertUtils.notTrue(yxSchoolMajorService.exist(yxSchoolMajor), String.format("专业-[%s]-已经录入", majorCode));
if (StringUtils.isNotBlank(yxSchoolMajor.getMajorName())) {
yxSchoolMajor.setMajorName(yxSchoolMajor.getMajorName().replace("(","（").replace(")","）"));
}
if (StringUtils.isNotBlank(yxSchoolMajor.getDetail())) {
yxSchoolMajor.setDetail(yxSchoolMajor.getDetail().replace("(","（").replace(")","）"));
}
yxSchoolMajorService.save(yxSchoolMajor);
return Result.OK("添加成功！");
}
@ -150,8 +157,12 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
AssertUtils.notEmpty(majorCode, "请输入[专业代码]!");
AssertUtils.notEmpty(majorName, "请输入[专业名称]!");
AssertUtils.notEmpty(yxSchoolMajor.getEnrollmentCode(), "请输入[招生代码]!");
//AssertUtils.notNull(yxSchoolMajor.getTuition(), "请输入[学费]!");
//AssertUtils.notTrue(yxSchoolMajorService.exist(yxSchoolMajor), String.format("专业-[%s]-已经录入", majorCode));
if (StringUtils.isNotBlank(yxSchoolMajor.getMajorName())) {
yxSchoolMajor.setMajorName(yxSchoolMajor.getMajorName().replace("(","（").replace(")","）"));
}
if (StringUtils.isNotBlank(yxSchoolMajor.getDetail())) {
yxSchoolMajor.setDetail(yxSchoolMajor.getDetail().replace("(","（").replace(")","）"));
}
if (StringUtils.isBlank(id)) {
yxSchoolMajorService.save(yxSchoolMajor);
}
@ -295,6 +306,7 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
String mainSubjects = null;
String majorTypeChild = null;
String stateValue = null;
String detail = null;
List<String> batchList = Arrays.asList("提前批", "本科A段", "本科B段", "本科", "高职高专");
List<DictModel> schoolMajorStateDict = sysDictService.getDictItems("school_major_state");
Map<String, String> schoolMajorStateTextMap = schoolMajorStateDict.stream().collect(Collectors.toMap(s -> s.getText(), s -> s.getValue()));
@ -303,9 +315,19 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
if (org.apache.commons.lang.StringUtils.isBlank(item.getSchoolCode()) && org.apache.commons.lang.StringUtils.isBlank(item.getMajorName())) {
continue;
}
if (index==54) {
System.out.println("111");
}
majorType = item.getMajorType();
mainSubjects = item.getMainSubjects();
majorTypeChild = item.getMajorTypeChild();
if (StringUtils.isNotBlank(item.getDetail())) {
detail = item.getDetail().replace("(","（").replace(")","）");
}else{
detail = "";
}
AssertUtils.notEmpty(item.getSchoolCode(), String.format("行[%s],请输入学校代码", index));
AssertUtils.notEmpty(item.getBatch(), String.format("行[%s],请输入批次", index));
@ -320,6 +342,10 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
AssertUtils.notEmpty(item.getProbabilityOperator(), String.format("行[%s],请输入对外录取方式运算符", index));
AssertUtils.notEmpty(item.getPrivateRulesEnrollProbability(), String.format("行[%s],请输入内部录取方式", index));
AssertUtils.notEmpty(item.getPrivateProbabilityOperator(), String.format("行[%s],请输入内部录取方式运算符", index));*/
if (item.getBatch().contains("高职")) {
item.setBatch("高职高专");
}
majorName = item.getMajorName().replace("(", "（").replace(")", "）");
item.setMajorName(majorName);
@ -381,11 +407,16 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
}
}
// 提取学费
try {
if (detail.contains("元/年")) {
item.setTuition(new BigDecimal(detail.split("元/年")[0].replace("（","")));
}
}catch (Exception e){
}
// 状态参数判断
stateValue = schoolMajorStateTextMap.get(item.getState());
AssertUtils.notEmpty(stateValue, String.format("行[%s],状态有误", index));
item.setState(stateValue);
AssertUtils.notTrue(!schoolMajorStateTextMap.values().contains(item.getState()),String.format("行[%s],状态有误", index));
}
index=3;
@ -399,28 +430,10 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory();
yxSchoolMajor = schoolMajorMap.get(key);
yxSchoolMajor.setRulesEnrollProbabilitySx(item.getRulesEnrollProbabilitySx());
yxSchoolMajor.setRulesEnrollProbability(item.getRulesEnrollProbability());
yxSchoolMajor.setProbabilityOperator(item.getProbabilityOperator());
yxSchoolMajor.setPrivateRulesEnrollProbability(item.getPrivateRulesEnrollProbability());
yxSchoolMajor.setPrivateProbabilityOperator(item.getPrivateRulesEnrollProbability());
if (StringUtils.isNotBlank(item.getDetail())) {
yxSchoolMajor.setDetail(item.getDetail());
if (yxSchoolMajor != null) {
item.setId(yxSchoolMajor.getId());
}
if (item.getChineseScoreLimitation()!=null) {
yxSchoolMajor.setChineseScoreLimitation(item.getChineseScoreLimitation());
}
if (item.getChineseScoreLimitation()!=null) {
yxSchoolMajor.setEnglishScoreLimitation(item.getEnglishScoreLimitation());
}
if (item.getChineseScoreLimitation()!=null) {
yxSchoolMajor.setCulturalScoreLimitation(item.getCulturalScoreLimitation());
}
if (item.getChineseScoreLimitation()!=null) {
yxSchoolMajor.setProfessionalScoreLimitation(item.getProfessionalScoreLimitation());
}
updatesList.add(yxSchoolMajor);
updatesList.add(item);
}
service.saveOrUpdateBatch(updatesList);
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");