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-22 23:31:43 +08:00
parent 59c68490ba
commit b20413b7bd
5 changed files with 310 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,12 +69,9 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
@Autowired @Autowired
private IYxSchoolChildService yxSchoolChildService; private IYxSchoolChildService yxSchoolChildService;
@Autowired @Autowired
private IYxSchoolService yxSchoolService;
@Autowired
private IYxHistoryScoreControlLineService yxHistoryScoreControlLineService;
@Autowired
private ISysDictService sysDictService; private ISysDictService sysDictService;
@Autowired
private IYxHistoryMajorEnrollService yxHistoryMajorEnrollService;
/** /**
* 分页列表查询 * 分页列表查询
* *
@ -294,9 +291,35 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
String a="_"; String a="_";
String key; String key;
List<YxSchoolMajor> yxSchoolMajorList =yxSchoolMajorService.list(); List<YxSchoolMajor> yxSchoolMajorList =yxSchoolMajorService.list();
LambdaQueryWrapper<YxHistoryMajorEnroll> yxHistoryMajorEnrollLambdaQueryWrapper = new LambdaQueryWrapper<>();
yxHistoryMajorEnrollLambdaQueryWrapper.eq(YxHistoryMajorEnroll::getYear,"2024");
List<YxHistoryMajorEnroll> yxHistoryMajorEnrollList = yxHistoryMajorEnrollService.list(yxHistoryMajorEnrollLambdaQueryWrapper);
Map<String, YxHistoryMajorEnroll> historyMajorEnrollMap = new LinkedHashMap<>();
for (YxHistoryMajorEnroll h : yxHistoryMajorEnrollList) {
key = h.getSchoolCode()+ a + h.getBatch() +a + h.getMajorName() + a + h.getCategory();
if ("音乐类".equals(h.getMajorType())) {
if ("音乐表演".equals(h.getMainSubjects())) {
key+= a + h.getMainSubjects() + a+ h.getMajorTypeChild();
}else{
key+= a + h.getMainSubjects();
}
}
historyMajorEnrollMap.put(key, h);
}
Map<String,YxSchoolMajor> schoolMajorMap = new HashMap<>(); Map<String,YxSchoolMajor> schoolMajorMap = new HashMap<>();
for (YxSchoolMajor item : yxSchoolMajorList) { for (YxSchoolMajor item : yxSchoolMajorList) {
key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory(); key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory();
if ("音乐类".equals(item.getMajorType())) {
if ("音乐表演".equals(item.getMainSubjects())) {
key+= a + item.getMainSubjects() + a+ item.getMajorTypeChild();
}else{
key+= a + item.getMainSubjects();
}
}else if("表演类".equals(item.getMajorType())){
key+= a + item.getMainSubjects();
}
schoolMajorMap.put(key,item); schoolMajorMap.put(key,item);
} }
Map<String, YxMajor> majorMap = yxMajorService.mapsForMajorName(); Map<String, YxMajor> majorMap = yxMajorService.mapsForMajorName();
@ -333,7 +356,19 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
AssertUtils.notEmpty(item.getMajorName(), String.format("行[%s],请输入专业名称", index)); AssertUtils.notEmpty(item.getMajorName(), String.format("行[%s],请输入专业名称", index));
AssertUtils.notEmpty(item.getMajorType(), String.format("行[%s],请输入专业类型", index)); AssertUtils.notEmpty(item.getMajorType(), String.format("行[%s],请输入专业类型", index));
AssertUtils.notEmpty(item.getCategory(), String.format("行[%s],请输入科类", index)); AssertUtils.notEmpty(item.getCategory(), String.format("行[%s],请输入科类", index));
AssertUtils.notEmpty(item.getState(), String.format("行[%s],请输入状态", index));
if(item.getEnrollmentCode().length() == 1){
item.setEnrollmentCode("0"+item.getEnrollmentCode());
}
if (item.getSchoolCode().length() == 1) {
item.setSchoolCode("000" + item.getSchoolCode());
}else if (item.getSchoolCode().length() == 2) {
item.setSchoolCode("00" + item.getSchoolCode());
}else if (item.getSchoolCode().length() == 3) {
item.setSchoolCode("0" + item.getSchoolCode());
}
// AssertUtils.notEmpty(item.getState(), String.format("行[%s],请输入状态", index));
/*AssertUtils.notEmpty(item.getRulesEnrollProbabilitySx(), String.format("行[%s],请输入录取方式缩写", index)); /*AssertUtils.notEmpty(item.getRulesEnrollProbabilitySx(), String.format("行[%s],请输入录取方式缩写", index));
AssertUtils.notEmpty(item.getRulesEnrollProbability(), String.format("行[%s],请输入对外录取方式", index)); AssertUtils.notEmpty(item.getRulesEnrollProbability(), String.format("行[%s],请输入对外录取方式", index));
@ -344,6 +379,18 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
item.setBatch("高职高专"); item.setBatch("高职高专");
} }
key = item.getSchoolCode() + a + item.getBatch() + a + item.getMajorName() + a + item.getCategory();
if ("音乐类".equals(item.getMajorType())) {
if ("音乐表演".equals(item.getMainSubjects())) {
key+= a + item.getMainSubjects() + a+ item.getMajorTypeChild();
}else{
key+= a + item.getMainSubjects();
}
}else if("表演类".equals(item.getMajorType())){
key+= a + item.getMainSubjects();
}
YxHistoryMajorEnroll yxHistoryMajorEnroll = historyMajorEnrollMap.get(key);
item.setState(yxHistoryMajorEnroll != null? "1": "2");
majorName = item.getMajorName().replace("(", "（").replace(")", "）"); majorName = item.getMajorName().replace("(", "（").replace(")", "）");
item.setMajorName(majorName); item.setMajorName(majorName);
@ -361,50 +408,40 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
AssertUtils.isTrue(batchList.contains(item.getBatch()), String.format("行[%s],批次 无效", index)); AssertUtils.isTrue(batchList.contains(item.getBatch()), String.format("行[%s],批次 无效", index));
//判断专业类型 //判断专业类型
if ("舞蹈类".equals(majorType)) { // if(majorType.contains("音乐类")){
AssertUtils.notEmpty(mainSubjects, String.format("行[%s],未识别到舞蹈类型-主考科目", index)); // //主考科目
if (mainSubjects.contains("艺术舞蹈")) { // AssertUtils.notEmpty(mainSubjects,String.format("行[%s],未识别到音乐类型-主考科目", index));
item.setMainSubjects("艺术舞蹈"); // if (mainSubjects.contains("器乐")&&mainSubjects.contains("声乐")) {
}else if (mainSubjects.contains("国际标准")) { // item.setMainSubjects("器乐,声乐");
item.setMainSubjects("国际标准"); // } else if (mainSubjects.contains("器乐")) {
}else { // item.setMainSubjects("器乐");
throw new JeecgBootException(String.format("行[%s],未识别到舞蹈类型-主考科目", index)); // }else if (mainSubjects.contains("声乐")) {
} // item.setMainSubjects("声乐");
// }else {
} else if(majorType.contains("音乐类")){ // throw new JeecgBootException(String.format("行[%s],未识别到音乐类型-主考科目", index));
//主考科目 // }
AssertUtils.notEmpty(mainSubjects,String.format("行[%s],未识别到音乐类型-主考科目", index)); // //专业子类
if (mainSubjects.contains("器乐")&&mainSubjects.contains("声乐")) { // if (majorTypeChild.contains("音乐表演")) {
item.setMainSubjects("器乐,声乐"); // item.setMajorTypeChild("音乐表演");
} else if (mainSubjects.contains("器乐")) { // }else if (majorTypeChild.contains("音乐教育")) {
item.setMainSubjects("器乐"); // item.setMajorTypeChild("音乐教育");
}else if (mainSubjects.contains("声乐")) { // }else {
item.setMainSubjects("声乐"); // throw new JeecgBootException(String.format("行[%s],未识别到音乐类型-专业子级类别", index));
}else { // }
throw new JeecgBootException(String.format("行[%s],未识别到音乐类型-主考科目", index)); // }else if ("表演类".equals(majorType)) {
} // AssertUtils.notEmpty(mainSubjects, String.format("行[%s],未识别到表演类型-主考科目", index));
//专业子类 // if (mainSubjects.contains("服装表演")) {
if (majorTypeChild.contains("音乐表演")) { // item.setMainSubjects("服装表演");
item.setMajorTypeChild("音乐表演"); // }else if (mainSubjects.contains("戏剧影视表演")) {
}else if (majorTypeChild.contains("音乐教育")) { // item.setMainSubjects("戏剧影视表演");
item.setMajorTypeChild("音乐教育"); // }else if (mainSubjects.contains("戏剧影视导演")) {
}else { // item.setMainSubjects("戏剧影视导演");
throw new JeecgBootException(String.format("行[%s],未识别到音乐类型-专业子级类别", index)); // }else if (mainSubjects.contains("兼报")) {
} // item.setMainSubjects("兼报");
}else if ("表演类".equals(majorType)) { // }else {
AssertUtils.notEmpty(mainSubjects, String.format("行[%s],未识别到表演类型-主考科目", index)); // throw new JeecgBootException(String.format("行[%s],未识别到表演类型-主考科目", index));
if (mainSubjects.contains("服装表演")) { // }
item.setMainSubjects("服装表演"); // }
}else if (mainSubjects.contains("戏剧影视表演")) {
item.setMainSubjects("戏剧影视表演");
}else if (mainSubjects.contains("戏剧影视导演")) {
item.setMainSubjects("戏剧影视导演");
}else if (mainSubjects.contains("兼报")) {
item.setMainSubjects("兼报");
}else {
throw new JeecgBootException(String.format("行[%s],未识别到表演类型-主考科目", index));
}
}
// 提取学费 // 提取学费
try { try {
@ -429,8 +466,17 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
if (org.apache.commons.lang.StringUtils.isBlank(item.getSchoolCode()) && org.apache.commons.lang.StringUtils.isBlank(item.getMajorName())) { if (org.apache.commons.lang.StringUtils.isBlank(item.getSchoolCode()) && org.apache.commons.lang.StringUtils.isBlank(item.getMajorName())) {
continue; continue;
} }
// AssertUtils.isTrue(schoolCodeList.contains(item.getSchoolCode()),String.format("行[%s],学校代码-[%s]-系统不存在", index,item.getSchoolCode()));
key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory(); key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory();
// key = item.getSchoolCode() + a + item.getBatch() + a + item.getMajorName() + a + item.getCategory();
if ("音乐类".equals(item.getMajorType())) {
if ("音乐表演".equals(item.getMainSubjects())) {
key+= a + item.getMainSubjects() + a+ item.getMajorTypeChild();
}else{
key+= a + item.getMainSubjects();
}
}else if("表演类".equals(item.getMajorType())){
key+= a + item.getMainSubjects();
}
yxSchoolMajor = schoolMajorMap.get(key); yxSchoolMajor = schoolMajorMap.get(key);
if (yxSchoolMajor != null) { if (yxSchoolMajor != null) {
@ -484,61 +530,186 @@ public class YxSchoolMajorController extends JeecgController<YxSchoolMajor, IYxS
List<SchoolMajorLqfsDTO> list = ExcelImportUtil.importExcel(file.getInputStream(), SchoolMajorLqfsDTO.class, params); List<SchoolMajorLqfsDTO> list = ExcelImportUtil.importExcel(file.getInputStream(), SchoolMajorLqfsDTO.class, params);
String a="_"; String a="_";
String key; String key;
List<YxSchoolMajor> yxSchoolMajorList =yxSchoolMajorService.list(); LambdaQueryWrapper<YxSchoolMajor> schoolMajorLambdaQueryWrapper = new LambdaQueryWrapper<>();
schoolMajorLambdaQueryWrapper.eq(YxSchoolMajor::getMajorType, list.get(0).getMajorType());
List<YxSchoolMajor> yxSchoolMajorList =yxSchoolMajorService.list(schoolMajorLambdaQueryWrapper);
Map<String,YxSchoolMajor> schoolMajorMap = new HashMap<>(); Map<String,YxSchoolMajor> schoolMajorMap = new HashMap<>();
List<YxSchoolMajor> updatesList = new ArrayList<>(); List<YxSchoolMajor> updatesList = new ArrayList<>();
List<YxSchoolMajor> addsList = new ArrayList<>();
for (YxSchoolMajor item : yxSchoolMajorList) { for (YxSchoolMajor item : yxSchoolMajorList) {
index++; index++;
AssertUtils.notEmpty(item.getSchoolCode(), String.format("行[%s],请输入学校代码", index)); AssertUtils.notEmpty(item.getSchoolCode(), String.format("行[%s],请输入学校代码", index));
AssertUtils.notEmpty(item.getBatch(), String.format("行[%s],请输入批次", index)); AssertUtils.notEmpty(item.getBatch(), String.format("行[%s],请输入批次", index));
AssertUtils.notEmpty(item.getMajorName(), String.format("行[%s],请输入专业名称", index)); AssertUtils.notEmpty(item.getMajorName(), String.format("行[%s],请输入专业名称", index));
AssertUtils.notEmpty(item.getCategory(), String.format("行[%s],请输入科类", index)); AssertUtils.notEmpty(item.getCategory(), String.format("行[%s],请输入科类", index));
key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory(); key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory()+a+item.getMajorType();
schoolMajorMap.put(key,item); schoolMajorMap.put(key,item);
} }
YxSchoolMajor yxSchoolMajor = null;
for (SchoolMajorLqfsDTO schoolMajorLqfsDTO : list) {
schoolMajorLqfsDTO.setMajorName(schoolMajorLqfsDTO.getMajorName().replace("(","（").replace(")","）"));
index=3; if(schoolMajorLqfsDTO.getSchoolCode().length() == 1){
YxSchoolMajor yxSchoolMajor; schoolMajorLqfsDTO.setSchoolCode("000"+schoolMajorLqfsDTO.getSchoolCode());
String probabilityOperator =""; }else if(schoolMajorLqfsDTO.getSchoolCode().length() == 2){
for (SchoolMajorLqfsDTO item : list) { schoolMajorLqfsDTO.setSchoolCode("00"+schoolMajorLqfsDTO.getSchoolCode());
index++; }else if(schoolMajorLqfsDTO.getSchoolCode().length() == 3){
probabilityOperator=""; schoolMajorLqfsDTO.setSchoolCode("0"+schoolMajorLqfsDTO.getSchoolCode());
key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory();
if(StringUtils.isBlank(item.getProbabilityOperatorWen()) && StringUtils.isBlank(item.getProbabilityOperatorZhuan())){
continue;
} }
if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){ if(schoolMajorLqfsDTO.getEnrollmentCode().length() == 1){
probabilityOperator+="文*"+item.getProbabilityOperatorWen(); schoolMajorLqfsDTO.setEnrollmentCode("0"+schoolMajorLqfsDTO.getEnrollmentCode());
} }
if(StringUtils.isNotBlank(item.getProbabilityOperatorZhuan())){ key = schoolMajorLqfsDTO.getSchoolCode()+a+schoolMajorLqfsDTO.getBatch()+a+schoolMajorLqfsDTO.getMajorName()+a+schoolMajorLqfsDTO.getCategory()+a+schoolMajorLqfsDTO.getMajorType();
if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){
probabilityOperator+="+";
}
probabilityOperator+="专*"+item.getProbabilityOperatorZhuan();
}
yxSchoolMajor = schoolMajorMap.get(key); yxSchoolMajor = schoolMajorMap.get(key);
yxSchoolMajor.setRulesEnrollProbabilitySx(item.getRulesEnrollProbabilitySx()); if(yxSchoolMajor==null){
yxSchoolMajor.setRulesEnrollProbability(probabilityOperator); yxSchoolMajor = new YxSchoolMajor();
yxSchoolMajor.setProbabilityOperator(probabilityOperator); yxSchoolMajor.setSchoolCode(schoolMajorLqfsDTO.getSchoolCode());
if (StringUtils.isNotBlank(item.getDetail())) { yxSchoolMajor.setBatch(schoolMajorLqfsDTO.getBatch());
yxSchoolMajor.setDetail(item.getDetail()); yxSchoolMajor.setEnrollmentCode(schoolMajorLqfsDTO.getEnrollmentCode());
yxSchoolMajor.setMajorName(schoolMajorLqfsDTO.getMajorName());
yxSchoolMajor.setMajorType(schoolMajorLqfsDTO.getMajorType());
yxSchoolMajor.setCategory(schoolMajorLqfsDTO.getCategory());
yxSchoolMajor.setMainSubjects(schoolMajorLqfsDTO.getZkkm());
yxSchoolMajor.setMajorTypeChild(schoolMajorLqfsDTO.getZyzjlb());
yxSchoolMajor.setRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability());
yxSchoolMajor.setRulesEnrollProbabilitySx(schoolMajorLqfsDTO.getRulesEnrollProbabilitySx());
yxSchoolMajor.setPrivateRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability());
yxSchoolMajor.setProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator());
yxSchoolMajor.setPrivateProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator());
yxSchoolMajor.setPlanNum(Integer.valueOf(schoolMajorLqfsDTO.getPlanNum()));
yxSchoolMajor.setTuition(schoolMajorLqfsDTO.getXuefei());
yxSchoolMajor.setState("2"); // 新增
yxSchoolMajor.setCulturalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getCulturalScoreLimitation()));
yxSchoolMajor.setProfessionalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getProfessionalScoreLimitation()));
yxSchoolMajor.setChineseScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getChineseScoreLimitation()));
yxSchoolMajor.setEnglishScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getEnglishScoreLimitation()));
addsList.add(yxSchoolMajor);
if (StringUtils.isBlank(schoolMajorLqfsDTO.getZkkm())) {
schoolMajorLqfsDTO.setZkkm("");
}
// 专业子级
if (StringUtils.isBlank(schoolMajorLqfsDTO.getZyzjlb())) {
schoolMajorLqfsDTO.setZyzjlb("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getRulesEnrollProbability())){
schoolMajorLqfsDTO.setRulesEnrollProbability("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getProbabilityOperator())){
schoolMajorLqfsDTO.setProbabilityOperator("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getPlanNum())){
schoolMajorLqfsDTO.setPlanNum("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getXuefei())){
schoolMajorLqfsDTO.setXuefei("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getDetail())){
schoolMajorLqfsDTO.setDetail("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getProfessionalScoreLimitation())){
schoolMajorLqfsDTO.setProfessionalScoreLimitation("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getCulturalScoreLimitation())){
schoolMajorLqfsDTO.setCulturalScoreLimitation("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getEnglishScoreLimitation())){
schoolMajorLqfsDTO.setEnglishScoreLimitation("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getSfxz())){
schoolMajorLqfsDTO.setSfxz("");
}
if(StringUtils.isBlank(schoolMajorLqfsDTO.getSfgbyz())){
schoolMajorLqfsDTO.setSfgbyz("");
}
System.out.println(schoolMajorLqfsDTO.getSchoolCode()+","+schoolMajorLqfsDTO.getSchoolName()+","+schoolMajorLqfsDTO.getBatch()+","+schoolMajorLqfsDTO.getEnrollmentCode()+","+
schoolMajorLqfsDTO.getMajorName()+","+schoolMajorLqfsDTO.getMajorType()+","+schoolMajorLqfsDTO.getZkkm()+","+schoolMajorLqfsDTO.getZyzjlb()+","+"2025"+","+
schoolMajorLqfsDTO.getCategory()+","+schoolMajorLqfsDTO.getRulesEnrollProbability()+","+schoolMajorLqfsDTO.getProbabilityOperator()+","+ schoolMajorLqfsDTO.getPlanNum()+","+
schoolMajorLqfsDTO.getXuefei()+","+schoolMajorLqfsDTO.getDetail()+","+schoolMajorLqfsDTO.getProfessionalScoreLimitation()+","+schoolMajorLqfsDTO.getEnglishScoreLimitation()+","+schoolMajorLqfsDTO.getCulturalScoreLimitation()+","+
schoolMajorLqfsDTO.getSfxz()+","+ schoolMajorLqfsDTO.getSfgbyz()
);
}else{
yxSchoolMajor.setRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability());
yxSchoolMajor.setProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator());
yxSchoolMajor.setPrivateProbabilityOperator(schoolMajorLqfsDTO.getProbabilityOperator());
yxSchoolMajor.setPrivateRulesEnrollProbability(schoolMajorLqfsDTO.getRulesEnrollProbability());
if (StringUtils.isNotBlank(schoolMajorLqfsDTO.getPlanNum())) {
yxSchoolMajor.setPlanNum(Integer.parseInt(schoolMajorLqfsDTO.getPlanNum()));
}
if (StringUtils.isNotBlank(schoolMajorLqfsDTO.getXuefei())) {
yxSchoolMajor.setTuition(schoolMajorLqfsDTO.getXuefei());
}
yxSchoolMajor.setDetail(schoolMajorLqfsDTO.getDetail());
if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getProfessionalScoreLimitation())){
yxSchoolMajor.setProfessionalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getProfessionalScoreLimitation()));
}
if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getCulturalScoreLimitation())){
yxSchoolMajor.setCulturalScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getCulturalScoreLimitation()));
}
if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getChineseScoreLimitation())){
yxSchoolMajor.setChineseScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getChineseScoreLimitation()));
}
if(StringUtils.isNotBlank(schoolMajorLqfsDTO.getEnglishScoreLimitation())){
yxSchoolMajor.setEnglishScoreLimitation(new BigDecimal(schoolMajorLqfsDTO.getEnglishScoreLimitation()));
}
if ("是".equals(schoolMajorLqfsDTO.getSfxz())) {
yxSchoolMajor.setState("2");
}
updatesList.add(yxSchoolMajor);
} }
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);
} }
service.updateBatchById(updatesList); if(updatesList.size()>0){
yxSchoolMajorService.updateBatchById(updatesList);
}
if(addsList.size()>0){
yxSchoolMajorService.saveBatch(addsList);
}
// index=3;
// YxSchoolMajor yxSchoolMajor;
// String probabilityOperator ="";
// for (SchoolMajorLqfsDTO item : list) {
// index++;
// probabilityOperator="";
// key = item.getSchoolCode()+a+item.getBatch()+a+item.getMajorName()+a+item.getCategory();
// if(StringUtils.isBlank(item.getProbabilityOperatorWen()) && StringUtils.isBlank(item.getProbabilityOperatorZhuan())){
// continue;
// }
// if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){
// probabilityOperator+="文*"+item.getProbabilityOperatorWen();
// }
//
// if(StringUtils.isNotBlank(item.getProbabilityOperatorZhuan())){
// if(StringUtils.isNotBlank(item.getProbabilityOperatorWen())){
// probabilityOperator+="+";
// }
// probabilityOperator+="专*"+item.getProbabilityOperatorZhuan();
// }
// yxSchoolMajor = schoolMajorMap.get(key);
// yxSchoolMajor.setRulesEnrollProbabilitySx(item.getRulesEnrollProbabilitySx());
// yxSchoolMajor.setRulesEnrollProbability(probabilityOperator);
// yxSchoolMajor.setProbabilityOperator(probabilityOperator);
// if (StringUtils.isNotBlank(item.getDetail())) {
// yxSchoolMajor.setDetail(item.getDetail());
// }
// if (item.getChineseScoreLimitation()!=null) {
// yxSchoolMajor.setChineseScoreLimitation(item.getChineseScoreLimitation());
// }
// if (item.getEnglishScoreLimitation()!=null) {
// yxSchoolMajor.setEnglishScoreLimitation(item.getEnglishScoreLimitation());
// }
// if (item.getCulturalScoreLimitation()!=null) {
// yxSchoolMajor.setCulturalScoreLimitation(item.getCulturalScoreLimitation());
// }
// if (item.getProbabilityOperatorWen()!=null) {
// yxSchoolMajor.setProfessionalScoreLimitation(item.getProfessionalScoreLimitation());
// }
// updatesList.add(yxSchoolMajor);
// }
// service.updateBatchById(updatesList);
log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒"); log.info("消耗时间" + (System.currentTimeMillis() - start) + "毫秒");
return Result.ok("文件导入成功！数据行数：" + list.size()); return Result.ok("文件导入成功！数据行数：" + list.size());
} catch (Exception e) { } catch (Exception e) {

41
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/dto/SchoolMajorLqfsDTO.java
View File

@ -19,6 +19,10 @@ public class SchoolMajorLqfsDTO implements Serializable {
@Excel(name = "学校代码", width = 15) @Excel(name = "学校代码", width = 15)
@ApiModelProperty(value = "学校代码") @ApiModelProperty(value = "学校代码")
private java.lang.String schoolCode; private java.lang.String schoolCode;
/**学校名称*/
@Excel(name = "学校名称", width = 15)
@ApiModelProperty(value = "学校名称")
private java.lang.String schoolName;
/**批次*/ /**批次*/
@Excel(name = "批次", width = 15) @Excel(name = "批次", width = 15)
@ApiModelProperty(value = "批次") @ApiModelProperty(value = "批次")
@ -39,6 +43,15 @@ public class SchoolMajorLqfsDTO implements Serializable {
@Excel(name = "科类(文科/理科)", width = 15) @Excel(name = "科类(文科/理科)", width = 15)
@ApiModelProperty(value = "科类(文科/理科)") @ApiModelProperty(value = "科类(文科/理科)")
private java.lang.String category; private java.lang.String category;
@Excel(name = "主考科目", width = 15)
@ApiModelProperty(value = "主考科目")
private java.lang.String zkkm;
@Excel(name = "专业子级类别", width = 15)
@ApiModelProperty(value = "专业子级类别")
private java.lang.String zyzjlb;
/**录取方式缩写*/ /**录取方式缩写*/
@Excel(name = "录取方式缩写(用于筛选条件)", width = 15) @Excel(name = "录取方式缩写(用于筛选条件)", width = 15)
@ApiModelProperty(value = "录取方式缩写(用于筛选条件)") @ApiModelProperty(value = "录取方式缩写(用于筛选条件)")
@ -50,6 +63,23 @@ public class SchoolMajorLqfsDTO implements Serializable {
@ApiModelProperty(value = "对外录取方式") @ApiModelProperty(value = "对外录取方式")
private java.lang.String rulesEnrollProbability; private java.lang.String rulesEnrollProbability;
@Excel(name = "对外录取方式运算符", width = 15)
@ApiModelProperty(value = "对外录取方式运算符")
private java.lang.String probabilityOperator;
@Excel(name = "计划招生人数", width = 15)
@ApiModelProperty(value = "计划招生人数")
private java.lang.String planNum;
@Excel(name = "学费")
private String xuefei;
@Excel(name = "是否为新增")
private String sfxz;
@Excel(name = "是否改变录取原则")
private String sfgbyz;
/**对外录取方式运算符(文)*/ /**对外录取方式运算符(文)*/
@Excel(name = "对外录取方式运算符(文)", width = 15) @Excel(name = "对外录取方式运算符(文)", width = 15)
@ApiModelProperty(value = "对外录取方式运算符(文)") @ApiModelProperty(value = "对外录取方式运算符(文)")
@ -68,31 +98,34 @@ public class SchoolMajorLqfsDTO implements Serializable {
@Excel(name = "备注", width = 15) @Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注") @ApiModelProperty(value = "备注")
private java.lang.String detail; private java.lang.String detail;
@Excel(name = "状态", width = 15)
private String status;
/** /**
* 文化分限制 * 文化分限制
*/ */
@ApiModelProperty(value = "文化成绩限制") @ApiModelProperty(value = "文化成绩限制")
@Excel(name = "文化成绩限制", width = 15) @Excel(name = "文化成绩限制", width = 15)
private BigDecimal culturalScoreLimitation; private String culturalScoreLimitation;
/** /**
* 专业分限制 * 专业分限制
*/ */
@ApiModelProperty(value = "专业成绩限制") @ApiModelProperty(value = "专业成绩限制")
@Excel(name = "专业成绩限制", width = 15) @Excel(name = "专业成绩限制", width = 15)
private BigDecimal professionalScoreLimitation; private String professionalScoreLimitation;
/** /**
* 语文分限制 * 语文分限制
*/ */
@ApiModelProperty(value = "语文成绩限制") @ApiModelProperty(value = "语文成绩限制")
@Excel(name = "语文成绩限制", width = 15) @Excel(name = "语文成绩限制", width = 15)
private BigDecimal chineseScoreLimitation; private String chineseScoreLimitation;
/** /**
* 外语成绩限制 * 外语成绩限制
*/ */
@ApiModelProperty(value = "外语成绩限制") @ApiModelProperty(value = "外语成绩限制")
@Excel(name = "外语成绩限制", width = 15) @Excel(name = "外语成绩限制", width = 15)
private BigDecimal englishScoreLimitation; private String englishScoreLimitation;
} }

7
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxSchoolMajor.java
View File

@ -39,6 +39,12 @@ public class YxSchoolMajor implements Serializable {
@ApiModelProperty(value = "学校代码") @ApiModelProperty(value = "学校代码")
@Dict(dictTable = "yx_school_child",dicCode = "school_code",dicText = "school_name") @Dict(dictTable = "yx_school_child",dicCode = "school_code",dicText = "school_name")
private java.lang.String schoolCode; private java.lang.String schoolCode;
/**学校代码*/
@Excel(name = "学校名称", width = 15)
@ApiModelProperty(value = "学校名称")
private java.lang.String schoolName;
/**专业代码*/ /**专业代码*/
@ApiModelProperty(value = "专业代码") @ApiModelProperty(value = "专业代码")
@Dict(dictTable = "yx_major",dicCode = "major_code",dicText = "major_name") @Dict(dictTable = "yx_major",dicCode = "major_code",dicText = "major_name")
@ -81,6 +87,7 @@ public class YxSchoolMajor implements Serializable {
/**学费*/ /**学费*/
@Excel(name = "学费")
@ApiModelProperty(value = "学费") @ApiModelProperty(value = "学费")
private java.lang.String tuition; private java.lang.String tuition;
/**学制*/ /**学制*/

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml
View File

@ -105,7 +105,7 @@
</if> </if>
<!--批次--> <!--批次-->
<if test="queryvo.batch!=null and queryvo.batch!=''"> <if test="queryvo.batch!=null and queryvo.batch!=''">
AND cm.batch = #{queryvo.batch} AND cm.batch like concat('%',#{queryvo.batch},'%')
</if> </if>
<if test="queryvo.batchList!=null and queryvo.batchList.size>0"> <if test="queryvo.batchList!=null and queryvo.batchList.size>0">
AND cm.batch in AND cm.batch in

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

@ -126,19 +126,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
public ArtRecommendMajorBaseDTO recommendMajorPage(QueryRecommendMajorVO queryRecommendMajorVO) { public ArtRecommendMajorBaseDTO recommendMajorPage(QueryRecommendMajorVO queryRecommendMajorVO) {
Integer pageNum = queryRecommendMajorVO.getPageNum(); Integer pageNum = queryRecommendMajorVO.getPageNum();
Integer pageSize = queryRecommendMajorVO.getPageSize(); Integer pageSize = queryRecommendMajorVO.getPageSize();
// LambdaQueryWrapper<YxHistoryMajorEnroll> lqw = new LambdaQueryWrapper<>();
// lqw.eq(YxHistoryMajorEnroll::getYear,"2024");
// lqw.eq(YxHistoryMajorEnroll::getMajorType,"体育类");
// lqw.eq(YxHistoryMajorEnroll::getBatch,"本科");
// List<YxHistoryMajorEnroll> list = yxHistoryMajorEnrollService.list(lqw);
// for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) {
// if ("理科".equals(yxHistoryMajorEnroll.getCategory())) {
//
// }else{
//
// }
// }
if (pageNum == null) { if (pageNum == null) {
pageNum = 1; pageNum = 1;
} }
@ -152,6 +139,11 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
queryRecommendMajorVO.setCognitioPolyclinic(activeCurrentUserScore.getCognitioPolyclinic()); queryRecommendMajorVO.setCognitioPolyclinic(activeCurrentUserScore.getCognitioPolyclinic());
//专业类别 //专业类别
queryRecommendMajorVO.setProfessionalCategory(activeCurrentUserScore.getProfessionalCategory()); queryRecommendMajorVO.setProfessionalCategory(activeCurrentUserScore.getProfessionalCategory());
if (StringUtils.isNotBlank(queryRecommendMajorVO.getBatch())) {
queryRecommendMajorVO.setBatch(queryRecommendMajorVO.getBatch().replace("批",""));
}
//有子级专业 //有子级专业
if (StringUtils.isNotBlank(activeCurrentUserScore.getProfessionalCategoryChildren()) && !"高职高专".equals(queryRecommendMajorVO.getBatch())) { if (StringUtils.isNotBlank(activeCurrentUserScore.getProfessionalCategoryChildren()) && !"高职高专".equals(queryRecommendMajorVO.getBatch())) {
queryRecommendMajorVO.setPCategoryChildrenList(new ArrayList<>(Arrays.asList(activeCurrentUserScore.getProfessionalCategoryChildren().split(",")))); queryRecommendMajorVO.setPCategoryChildrenList(new ArrayList<>(Arrays.asList(activeCurrentUserScore.getProfessionalCategoryChildren().split(","))));
@ -225,14 +217,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
yxHistoryScoreControlLine.getCulturalScore(), yxHistoryScoreControlLine.getCulturalScore(),
yxHistoryScoreControlLine.getSpecialScore(), yxHistoryScoreControlLine.getSpecialScore(),
recommendMajorDTO.getFirstLevelDiscipline(), recommendMajorDTO.getProbabilityOperator()); recommendMajorDTO.getFirstLevelDiscipline(), recommendMajorDTO.getProbabilityOperator());
if(recommendMajorDTO.getSchoolCode().equals("6506")){
System.out.println("qvq");
}
// if("体育类".equals(recommendMajorDTO.getMajorType())
// && !"文过专排".equals(recommendMajorDTO.getRulesEnrollProbability())
// && !"专过文排".equals(recommendMajorDTO.getRulesEnrollProbability())){
// bigDecimal = bigDecimal.divide(YxConstant.bigDecimal7p5, 4, RoundingMode.HALF_UP);
// }
recommendMajorDTO.setScoreLineDifference(recommendMajorDTO.getStudentScore().subtract(bigDecimal)); recommendMajorDTO.setScoreLineDifference(recommendMajorDTO.getStudentScore().subtract(bigDecimal));
} }
} }