updates

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<YxArticle> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            //lambdaQueryWrapper.isNull(YxArticle::getSchoolId);
+            lambdaQueryWrapper.eq(YxArticle::getSchoolId,"");
+            List<YxArticle> list = yxArticleService.list(lambdaQueryWrapper);
+            Map<String, YxSchool> 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();

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<YxArticle, IYxArticleSe
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
+		if (StringUtils.isNotBlank(yxArticle.getTitle())) {
+			yxArticle.setTitle("*"+yxArticle.getTitle()+"*");
+		}
 		QueryWrapper<YxArticle> queryWrapper = QueryGenerator.initQueryWrapper(yxArticle, req.getParameterMap());
 		Page<YxArticle> page = new Page<YxArticle>(pageNo, pageSize);
 		IPage<YxArticle> pageList = yxArticleService.page(page, queryWrapper);

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());

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 {