diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java index cd16275..c79247e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java @@ -67,9 +67,9 @@ public class YxConstant { public static List defaultRulesEnrollProbabilityList = Arrays.asList("文过专排", "专过文排"); - public static String zhuanke= "高职高专"; - public static List batchList1=Arrays.asList("提前批","本科","本科A段","本科B段"); - public static Set batchSet1 = new HashSet<>(Arrays.asList("提前批","本科","本科A段","本科B段")); + public static String zhuanke = "高职高专"; + public static List batchList1 = Arrays.asList("提前批", "本科", "本科A段", "本科B段"); + public static Set batchSet1 = new HashSet<>(Arrays.asList("提前批", "本科", "本科A段", "本科B段")); //当天最多修改成绩次数 public static final Integer todayMaxEditScoreCount = 10; @@ -84,13 +84,13 @@ public class YxConstant { public static BigDecimal bigDecimal10 = new BigDecimal("10"); public static BigDecimal bigDecimal025 = new BigDecimal("0.25"); - public static final String REDIS_SCORE_KEY="USER_SCORE_"; + public static final String REDIS_SCORE_KEY = "USER_SCORE_"; //同ip仅可注册账户数量 public static final Integer ipRegisterNum = 3; // vip card redis key - public static String VIP_CARD_KEY="vip_card"; + public static String VIP_CARD_KEY = "vip_card"; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java index 3efa96b..befcaba 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BiaoyanService.java @@ -80,7 +80,7 @@ public class BiaoyanService { BigDecimal xjysby = activeCurrentUserScore.getXjysby();//戏剧影视表演-分数 //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = null; if (fzby != null && fzby.compareTo(YxConstant.bigDecimal0) > 0) { scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory, "服装表演", activeCurrentUserScore.getProvince()); @@ -446,7 +446,7 @@ public class BiaoyanService { BigDecimal xjysby = userScore.getXjysby();//戏剧影视表演-分数 //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = null; if (fzby != null && fzby.compareTo(YxConstant.bigDecimal0) > 0) { scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory, "服装表演", userScore.getProvince()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java index bc27c11..99d9b55 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/BoYinService.java @@ -66,7 +66,7 @@ public class BoYinService { BigDecimal by = new BigDecimal(0);// //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, activeCurrentUserScore.getProvince()); if (scoreSegment != null) { by = scoreSegment.getScore(); @@ -212,7 +212,7 @@ public class BoYinService { BigDecimal culturalScore = userScore.getCulturalScore(); BigDecimal by = new BigDecimal(0);//1.先把当前专业分转换成去年分数 //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, "播音与主持类", null, userScore.getProvince()); if (scoreSegment != null) { by = scoreSegment.getScore(); 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 52f767f..5cb9a0a 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 @@ -82,7 +82,7 @@ public class MusicService { BigDecimal yyjy = activeCurrentUserScore.getYyjy();//音乐表演声乐-分数 BigDecimal yyScore = yybysy.max(yybyqy).max(yyjy); //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = null; if (yybysy != null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) { scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory, "音乐表演声乐", activeCurrentUserScore.getProvince()); @@ -507,7 +507,7 @@ public class MusicService { BigDecimal yybyqy = activeCurrentUserScore.getYybyqy();//音乐表演声乐-分数 BigDecimal yyjy = activeCurrentUserScore.getYyjy();//音乐表演声乐-分数 //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = null; if (yybysy != null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) { scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory, "音乐表演声乐", activeCurrentUserScore.getProvince()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java index 94916e3..1f5831e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/WuDaoService.java @@ -66,7 +66,7 @@ public class WuDaoService { BigDecimal yswd = new BigDecimal(0);// BigDecimal gjbzw = new BigDecimal(0); //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = null; scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, activeCurrentUserScore.getProvince()); yswd = scoreSegment.getScore(); @@ -238,7 +238,7 @@ public class WuDaoService { BigDecimal divide = null; String mainSubjects = null; //=====================分数转换 start - if ("2024".equals(YxConstant.nowYear)) { + if ("2025".equals(YxConstant.nowYear)) { YxScoreSegment scoreSegment = null; scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, "艺术舞蹈", userScore.getProvince()); yswd = scoreSegment.getScore(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java index e7a57fb..18da5de 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java @@ -71,7 +71,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl