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-13 18:08:55 +08:00
parent 087933fd10
commit 7a267151ff
4 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java
View File

@ -69,8 +69,9 @@ public class MiniUserScoreController {
AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal750) > 0, "[文化成绩]最高分为750"); AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal750) > 0, "[文化成绩]最高分为750");
AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal0) < 0, "[文化成绩]最低分为0"); AssertUtils.notTrue(culturalScore.compareTo(YxConstant.bigDecimal0) < 0, "[文化成绩]最低分为0");
if("体育类".equals(professionalCategory)){
if ("音乐类".equals(professionalCategory)) { AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal150) > 0, "[体育成绩]最高分为150");
}else if ("音乐类".equals(professionalCategory)) {
AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0, "[主项成绩]最高分为300"); AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal300) > 0, "[主项成绩]最高分为300");
AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0, "[主项成绩]最低分为0"); AssertUtils.notTrue(professionalScore.compareTo(YxConstant.bigDecimal0) < 0, "[主项成绩]最低分为0");
} else if (!"表演类".equals(professionalCategory)) { } else if (!"表演类".equals(professionalCategory)) {

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

@ -274,22 +274,30 @@ 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 = "";
String key2 = ""; String key2 = "";
for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) { for (YxSchoolMajor yxSchoolMajor : yxSchoolMajorList) {
key = yxSchoolMajor.getSchoolCode()+"_"+ yxSchoolMajor.getMajorName() + "_" + yxSchoolMajor.getBatch() + "_" + yxSchoolMajor.getCategory(); key = "";
if ("音乐类".equals(yxSchoolMajor.getMajorType()) || "舞蹈类".equals(yxSchoolMajor.getMajorType())) {
key = yxSchoolMajor.getMajorTypeChild() + "_" + yxSchoolMajor.getMainSubjects();
}
key = key +"_"+ yxSchoolMajor.getSchoolCode()+"_"+ yxSchoolMajor.getMajorName() + "_" + yxSchoolMajor.getBatch() + "_" + yxSchoolMajor.getCategory();
map.put(key,yxSchoolMajor); map.put(key,yxSchoolMajor);
} }
YxSchoolMajor yxSchoolMajor = null; YxSchoolMajor yxSchoolMajor = null;
List<YxSchoolMajor> saveOrUpdateList = new ArrayList<>(); List<YxSchoolMajor> saveOrUpdateList = new ArrayList<>();
for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) { for (YxHistoryMajorEnroll yxHistoryMajorEnroll : list) {
key2 = yxHistoryMajorEnroll.getSchoolCode()+"_"+ yxHistoryMajorEnroll.getMajorName() + "_" + yxHistoryMajorEnroll.getBatch() + "_" + yxHistoryMajorEnroll.getCategory(); key2 = "";
if ("音乐类".equals(yxSchoolMajor.getMajorType()) || "舞蹈类".equals(yxSchoolMajor.getMajorType())) {
key2 = yxSchoolMajor.getMajorTypeChild() + "_" + yxSchoolMajor.getMainSubjects();
}
key2 = key2 +"_"+ yxHistoryMajorEnroll.getSchoolCode()+"_"+ yxHistoryMajorEnroll.getMajorName() + "_" + yxHistoryMajorEnroll.getBatch() + "_" + yxHistoryMajorEnroll.getCategory();
yxSchoolMajor = map.get(key2); yxSchoolMajor = map.get(key2);
if (yxSchoolMajor == null){ if (yxSchoolMajor == null){
yxSchoolMajor = new YxSchoolMajor(); yxSchoolMajor = new YxSchoolMajor();
@ -736,9 +744,9 @@ public class YxHistoryMajorEnrollController extends JeecgController<YxHistoryMaj
if (CollectionUtils.isNotEmpty(updateList)) { if (CollectionUtils.isNotEmpty(updateList)) {
yxHistoryMajorEnrollService.saveOrUpdateBatch(updateList); yxHistoryMajorEnrollService.saveOrUpdateBatch(updateList);
} }
if(CollectionUtils.isNotEmpty(schoolMajorList)){ // if(CollectionUtils.isNotEmpty(schoolMajorList)){
yxSchoolMajorService.saveOrUpdateBatch(schoolMajorList); // yxSchoolMajorService.saveOrUpdateBatch(schoolMajorList);
} // }
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) {

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

@ -375,7 +375,7 @@ public class MusicService {
historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList(); historyMajorEnrollList = recommendMajorDTO.getHistoryMajorEnrollList();
rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability(); rulesEnrollProbability = recommendMajorDTO.getPrivateRulesEnrollProbability();
probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator(); probabilityOperator = recommendMajorDTO.getPrivateProbabilityOperator();
if ("7604".equals(recommendMajorDTO.getSchoolCode()) && "音乐表演".equals(recommendMajorDTO.getMajorName())) { if ("6316".equals(recommendMajorDTO.getSchoolCode()) && "表演艺术".equals(recommendMajorDTO.getMajorName())) {
System.out.println("111"); System.out.println("111");
} }
if(index == 217){ if(index == 217){

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

@ -113,8 +113,8 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
}else if ("音乐类".equals(recommendMajorDTO.getCategory())) { }else if ("音乐类".equals(recommendMajorDTO.getCategory())) {
key = recommendMajorDTO.getMajorTypeChild() + "_" + recommendMajorDTO.getMainSubjects(); key = recommendMajorDTO.getMajorTypeChild() + "_" + recommendMajorDTO.getMainSubjects();
} }
key = key + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch(); key = key + year + a_ + recommendMajorDTO.getSchoolCode() + a_ + recommendMajorDTO.getMajorName() + a_ + recommendMajorDTO.getCategory() + a_ + recommendMajorDTO.getBatch();
yxHistoryMajorEnroll = majorEnrollMap.get(year + a_ + key); yxHistoryMajorEnroll = majorEnrollMap.get( key);
if (yxHistoryMajorEnroll != null) { if (yxHistoryMajorEnroll != null) {
//线差 //线差
if (yxHistoryMajorEnroll.getAdmissionLine()!=null) { if (yxHistoryMajorEnroll.getAdmissionLine()!=null) {