From fc8a58c7c1314a1c62ede696605865db965d27c4 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 13 Mar 2024 22:38:54 +0800 Subject: [PATCH] updates --- .../controller/MiniArticleController.java | 29 +++++++++++++++++++ .../yx/controller/YxArticleController.java | 3 ++ .../yx/controller/YxScoreController.java | 10 +++++++ .../modules/yx/service/impl/MusicService.java | 11 ++++++- 4 files changed, 52 insertions(+), 1 deletion(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java index 027c0d6..b2618db 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniArticleController.java @@ -156,6 +156,35 @@ public class MiniArticleController { yxSchoolResearchTeachingService.test(); } + if(false){ + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + //lambdaQueryWrapper.isNull(YxArticle::getSchoolId); + lambdaQueryWrapper.eq(YxArticle::getSchoolId,""); + List list = yxArticleService.list(lambdaQueryWrapper); + Map stringYxSchoolMap = yxSchoolService.mapsForSchoolName(); + String title = null; + String schoolName = null; + String year = ""; + for (YxArticle yxArticle : list) { + title = yxArticle.getTitle(); + schoolName = yxArticle.getSchoolName(); + if (title.contains("2022")) { + year = "2022"; + }else if (title.contains("2023")) { + year = "2023"; + }else if (title.contains("2024")) { + year = "2024"; + } + YxSchool yxSchool = stringYxSchoolMap.get(schoolName); + if (yxSchool == null) { + continue; + } + yxArticle.setType("1"); + yxArticle.setSchoolId(yxSchool.getId()); + } + yxArticleService.updateBatchById(list); + } + //分页 Integer pageNum = queryArticleVO.getPageNum(); Integer pageSize = queryArticleVO.getPageSize(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.java index dee0c73..d08b5d7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxArticleController.java @@ -74,6 +74,9 @@ public class YxArticleController extends JeecgController queryWrapper = QueryGenerator.initQueryWrapper(yxArticle, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = yxArticleService.page(page, queryWrapper); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java index 64cc2e8..0dc533c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java @@ -135,10 +135,20 @@ public class YxScoreController { scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory,"艺术舞蹈", yxUserScore.getProvince()); professionalScore = scoreSegment.getScore(); }else if("音乐类".equals(professionalCategory)){ + if (!professionalCategoryChildren.contains("器乐")) { + yxUserScore.setYybyqy(YxConstant.bigDecimal0); + }else if (!professionalCategoryChildren.contains("声乐")) { + yxUserScore.setYybysy(YxConstant.bigDecimal0); + }else if (!professionalCategoryChildren.contains("音乐教育")) { + yxUserScore.setYyjy(YxConstant.bigDecimal0); + } + BigDecimal yybysy = yxUserScore.getYybysy();//音乐表演声乐成绩 BigDecimal yybyqy = yxUserScore.getYybyqy();//音乐表演器乐成绩 BigDecimal yyjy = yxUserScore.getYyjy();//音乐教育成绩 + + if (yybysy!=null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) { //音乐表演声乐 scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory,"音乐表演声乐", yxUserScore.getProvince()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java index 3216b7b..654d7c9 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/MusicService.java @@ -147,7 +147,16 @@ public class MusicService { professionalScore3 = zxcj; } else { if ("音乐表演".equals(majorTypeChild)) { - if (mainSubjects.contains("器乐")) { + if(mainSubjects.contains("器乐") && mainSubjects.contains("声乐")){ + //如果当前专业，声乐和器乐都可以报,根据当前专业是声乐/器乐 取一个成绩高的 + if(activeCurrentUserScore.getYybysy().compareTo(YxConstant.bigDecimal0)>0){ + professionalScore2 = activeCurrentUserScore.getYybysy(); + professionalScore3 = yybysy; + }else{ + professionalScore2 = activeCurrentUserScore.getYybyqy(); + professionalScore3 = yybyqy; + } + }else if (mainSubjects.contains("器乐")) { professionalScore2 = activeCurrentUserScore.getYybyqy(); professionalScore3 = yybyqy; } else {