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-12-08 17:11:10 +08:00
parent 209fd451e0
commit a308c83091
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/constant/YxConstant.java
View File

@ -67,9 +67,9 @@ public class YxConstant {
public static List<String> defaultRulesEnrollProbabilityList = Arrays.asList("文过专排", "专过文排"); public static List<String> defaultRulesEnrollProbabilityList = Arrays.asList("文过专排", "专过文排");
public static String zhuanke= "高职高专"; public static String zhuanke = "高职高专";
public static List<String> batchList1=Arrays.asList("提前批","本科","本科A段","本科B段"); public static List<String> batchList1 = Arrays.asList("提前批", "本科", "本科A段", "本科B段");
public static Set<String> batchSet1 = new HashSet<>(Arrays.asList("提前批","本科","本科A段","本科B段")); public static Set<String> batchSet1 = new HashSet<>(Arrays.asList("提前批", "本科", "本科A段", "本科B段"));
//当天最多修改成绩次数 //当天最多修改成绩次数
public static final Integer todayMaxEditScoreCount = 10; public static final Integer todayMaxEditScoreCount = 10;
@ -84,13 +84,13 @@ public class YxConstant {
public static BigDecimal bigDecimal10 = new BigDecimal("10"); public static BigDecimal bigDecimal10 = new BigDecimal("10");
public static BigDecimal bigDecimal025 = new BigDecimal("0.25"); 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仅可注册账户数量 //同ip仅可注册账户数量
public static final Integer ipRegisterNum = 3; public static final Integer ipRegisterNum = 3;
// vip card redis key // vip card redis key
public static String VIP_CARD_KEY="vip_card"; public static String VIP_CARD_KEY = "vip_card";
} }

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

@ -80,7 +80,7 @@ public class BiaoyanService {
BigDecimal xjysby = activeCurrentUserScore.getXjysby();//戏剧影视表演-分数 BigDecimal xjysby = activeCurrentUserScore.getXjysby();//戏剧影视表演-分数
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = null; YxScoreSegment scoreSegment = null;
if (fzby != null && fzby.compareTo(YxConstant.bigDecimal0) > 0) { if (fzby != null && fzby.compareTo(YxConstant.bigDecimal0) > 0) {
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory, "服装表演", activeCurrentUserScore.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory, "服装表演", activeCurrentUserScore.getProvince());
@ -446,7 +446,7 @@ public class BiaoyanService {
BigDecimal xjysby = userScore.getXjysby();//戏剧影视表演-分数 BigDecimal xjysby = userScore.getXjysby();//戏剧影视表演-分数
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = null; YxScoreSegment scoreSegment = null;
if (fzby != null && fzby.compareTo(YxConstant.bigDecimal0) > 0) { if (fzby != null && fzby.compareTo(YxConstant.bigDecimal0) > 0) {
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory, "服装表演", userScore.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, fzby, professionalCategory, "服装表演", userScore.getProvince());

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

@ -66,7 +66,7 @@ public class BoYinService {
BigDecimal by = new BigDecimal(0);// BigDecimal by = new BigDecimal(0);//
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, activeCurrentUserScore.getProvince()); YxScoreSegment scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, activeCurrentUserScore.getProvince());
if (scoreSegment != null) { if (scoreSegment != null) {
by = scoreSegment.getScore(); by = scoreSegment.getScore();
@ -212,7 +212,7 @@ public class BoYinService {
BigDecimal culturalScore = userScore.getCulturalScore(); BigDecimal culturalScore = userScore.getCulturalScore();
BigDecimal by = new BigDecimal(0);//1.先把当前专业分转换成去年分数 BigDecimal by = new BigDecimal(0);//1.先把当前专业分转换成去年分数
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, "播音与主持类", null, userScore.getProvince()); YxScoreSegment scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, "播音与主持类", null, userScore.getProvince());
if (scoreSegment != null) { if (scoreSegment != null) {
by = scoreSegment.getScore(); by = scoreSegment.getScore();

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

@ -82,7 +82,7 @@ public class MusicService {
BigDecimal yyjy = activeCurrentUserScore.getYyjy();//音乐表演声乐-分数 BigDecimal yyjy = activeCurrentUserScore.getYyjy();//音乐表演声乐-分数
BigDecimal yyScore = yybysy.max(yybyqy).max(yyjy); BigDecimal yyScore = yybysy.max(yybyqy).max(yyjy);
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = null; YxScoreSegment scoreSegment = null;
if (yybysy != null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) { if (yybysy != null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) {
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory, "音乐表演声乐", activeCurrentUserScore.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory, "音乐表演声乐", activeCurrentUserScore.getProvince());
@ -507,7 +507,7 @@ public class MusicService {
BigDecimal yybyqy = activeCurrentUserScore.getYybyqy();//音乐表演声乐-分数 BigDecimal yybyqy = activeCurrentUserScore.getYybyqy();//音乐表演声乐-分数
BigDecimal yyjy = activeCurrentUserScore.getYyjy();//音乐表演声乐-分数 BigDecimal yyjy = activeCurrentUserScore.getYyjy();//音乐表演声乐-分数
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = null; YxScoreSegment scoreSegment = null;
if (yybysy != null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) { if (yybysy != null && yybysy.compareTo(YxConstant.bigDecimal0) > 0) {
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory, "音乐表演声乐", activeCurrentUserScore.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, yybysy, professionalCategory, "音乐表演声乐", activeCurrentUserScore.getProvince());

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

@ -66,7 +66,7 @@ public class WuDaoService {
BigDecimal yswd = new BigDecimal(0);// BigDecimal yswd = new BigDecimal(0);//
BigDecimal gjbzw = new BigDecimal(0); BigDecimal gjbzw = new BigDecimal(0);
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = null; YxScoreSegment scoreSegment = null;
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, activeCurrentUserScore.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, null, activeCurrentUserScore.getProvince());
yswd = scoreSegment.getScore(); yswd = scoreSegment.getScore();
@ -238,7 +238,7 @@ public class WuDaoService {
BigDecimal divide = null; BigDecimal divide = null;
String mainSubjects = null; String mainSubjects = null;
//=====================分数转换 start //=====================分数转换 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
YxScoreSegment scoreSegment = null; YxScoreSegment scoreSegment = null;
scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, "艺术舞蹈", userScore.getProvince()); scoreSegment = yxScoreSegmentService.checkOldYearScore(YxConstant.nowYear, professionalScore, professionalCategory, "艺术舞蹈", userScore.getProvince());
yswd = scoreSegment.getScore(); yswd = scoreSegment.getScore();

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

@ -71,7 +71,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
//将历史录取信息合并到专业信息里 //将历史录取信息合并到专业信息里
if (CollectionUtils.isNotEmpty(recommendMajorDTOList)) { if (CollectionUtils.isNotEmpty(recommendMajorDTOList)) {
// //
yxHistoryMajorEnrollService.recommendMajorDTOListSetHistoryInfo(recommendMajorDTOList, Collections.singletonList("2024")); yxHistoryMajorEnrollService.recommendMajorDTOListSetHistoryInfo(recommendMajorDTOList, Collections.singletonList("2025"));
/*if (!"美术与设计类".equals(userScore.getProfessionalCategory())) {}else{ /*if (!"美术与设计类".equals(userScore.getProfessionalCategory())) {}else{
yxHistoryMajorEnrollService.recommendMajorDTOListSetHistoryInfo(recommendMajorDTOList, ScoreUtil.getCalOldYears()); yxHistoryMajorEnrollService.recommendMajorDTOListSetHistoryInfo(recommendMajorDTOList, ScoreUtil.getCalOldYears());
}*/ }*/

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

@ -1078,7 +1078,7 @@ public class YxSchoolMajorServiceImpl extends ServiceImpl<YxSchoolMajorMapper, Y
} }
//===========判断使用哪个分数 start //===========判断使用哪个分数 start
if ("2024".equals(YxConstant.nowYear)) { if ("2025".equals(YxConstant.nowYear)) {
//音乐类，表演类，舞蹈类，播音主持类 会使用转换的分数，其他的不变 //音乐类，表演类，舞蹈类，播音主持类 会使用转换的分数，其他的不变
//同时 展示在前端的折合分，不会使用转换的分数(用原始的) //同时 展示在前端的折合分，不会使用转换的分数(用原始的)
majorTypeChild = recommendMajorDTO.getMajorTypeChild();//专业子项类型 majorTypeChild = recommendMajorDTO.getMajorTypeChild();//专业子项类型