From 32d0fd1e7843d5ed0e47a19a10280ffad31d6985 Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Mon, 23 Jun 2025 08:53:25 +0800 Subject: [PATCH] updates --- .../modules/mini/controller/MiniUserScoreController.java | 2 +- .../java/org/jeecg/modules/web/dto/RecommendMajorDTO.java | 3 +++ .../main/java/org/jeecg/modules/yx/constant/YxConstant.java | 4 ++-- .../org/jeecg/modules/yx/entity/YxCalculationMajor.java | 2 +- .../jeecg/modules/yx/mapper/YxCalculationMajorMapper.java | 2 ++ .../modules/yx/mapper/xml/YxCalculationMajorMapper.xml | 4 +++- .../org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml | 1 + .../modules/yx/service/IYxCalculationMajorService.java | 2 ++ .../yx/service/impl/YxCalculationMajorServiceImpl.java | 6 ++++++ .../modules/yx/service/impl/YxUserScoreServiceImpl.java | 3 ++- .../modules/yx/service/impl/YxVolunteerServiceImpl.java | 6 +++--- 11 files changed, 26 insertions(+), 9 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java index 7c6d3d5..caffbae 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniUserScoreController.java @@ -191,7 +191,7 @@ public class MiniUserScoreController { yxUserScore.setId(null); yxUserScore.setCreateTime(null); yxUserScore.setUpdateTime(null); - yxUserScore.setCalculationTableName("yx_calculation_major"); + yxUserScore.setCalculationTableName(YxConstant.newCalculationMajorName); //保存当前用户的得分 yxUserScoreService.save(yxUserScore); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java index ff15ee4..25ad161 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/RecommendMajorDTO.java @@ -157,4 +157,7 @@ public class RecommendMajorDTO implements Serializable { private BigDecimal scoreLineDifference; @ApiModelProperty(value = "状态") private String state; + + @ApiModelProperty(value = "学费") + private String tuition; } 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 c0efab0..9cc2af2 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 @@ -75,8 +75,8 @@ public class YxConstant { public static BigDecimal bigDecimal7p5 = new BigDecimal("7.5"); public static BigDecimal bigDecimal50 = new BigDecimal("50"); - public static String oldCalculationMajorName = "yx_calculation_major"; - public static String newCalculationMajorName = "yx_calculation_major"; + public static String oldCalculationMajorName = "yx_calculation_major_2025"; + public static String newCalculationMajorName = "yx_calculation_major_2025"; public static BigDecimal bigDecimal10 = new BigDecimal("10"); public static BigDecimal bigDecimal025 = new BigDecimal("0.25"); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java index 7050ed8..bfac5b3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/entity/YxCalculationMajor.java @@ -59,7 +59,7 @@ public class YxCalculationMajor implements Serializable { /**学费*/ @Excel(name = "学费", width = 15) @ApiModelProperty(value = "学费") - private java.math.BigDecimal tuition; + private String tuition; /**备注*/ @Excel(name = "备注", width = 15) @ApiModelProperty(value = "备注") diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java index dc91c5e..808e6e6 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxCalculationMajorMapper.java @@ -24,4 +24,6 @@ public interface YxCalculationMajorMapper extends BaseMapper void insertBatchNew(@Param("tableName") String tableName,@Param("scoreId")String scoreId,@Param("list") List list); List groupByBatchNumber(@Param(value = "tableName")String tableName,@Param("queryvo") QueryRecommendMajorVO queryRecommendMajorVO); + + YxCalculationMajor getCalculationById(@Param("calculationTableName") String calculationTableName, @Param("calculationMajorId") String calculationMajorId); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml index 78881f4..19dd4e3 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxCalculationMajorMapper.xml @@ -64,7 +64,6 @@ s.province as province, s.school_nature as schoolNature, s.institution_type as institutionType - FROM ${tableName} cm LEFT JOIN yx_school_child sc ON sc.school_code = cm.school_code LEFT JOIN yx_school_research_teaching srt ON srt.school_id = sc.school_id @@ -558,5 +557,8 @@ AND cm.enroll_probability >=0 GROUP BY cm.batch + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml index 94d8ade..56a31b7 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMajorMapper.xml @@ -37,6 +37,7 @@ sm.batch as batch, sm.enrollment_code as enrollmentCode, sm.major_code, + sm.tuition as tuition, sm.tuition as studyCost, sm.kslx, sm.plan_num as planNum diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java index 4232729..b4c68d2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxCalculationMajorService.java @@ -62,4 +62,6 @@ public interface IYxCalculationMajorService extends IService void copyNew(String oldScoreId, String newScoreId, String oldCalculationMajorTableName, String newCalculationMajorTableName); List groupByBatchNumber(QueryRecommendMajorVO queryRecommendMajorVO); + + YxCalculationMajor getCalculationById(String calculationTableName, String calculationMajorId); } 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 ddb0c8a..69273af 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 @@ -83,6 +83,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl recommendMajorList) { if (CollectionUtils.isNotEmpty(recommendMajorList)) { Set schoolIdSet = recommendMajorList.stream().map(RecommendMajorDTO::getSchoolId).collect(Collectors.toSet()); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java index 2cd555b..6ba0cc2 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxUserScoreServiceImpl.java @@ -10,6 +10,7 @@ import org.apache.shiro.SecurityUtils; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.AssertUtils; import org.jeecg.common.util.RedisUtil; +import org.jeecg.modules.yx.constant.YxConstant; import org.jeecg.modules.yx.dto.ProfessionalCategoryChildrenDTO; import org.jeecg.modules.yx.dto.UserScoreUpdateDTO; import org.jeecg.modules.yx.entity.YxCalculationMajor; @@ -188,7 +189,7 @@ public class YxUserScoreServiceImpl extends ServiceImpl35) { - throw new JeecgBootException("各批次仅可加35个志愿"); + if (yxVolunteerRecord.getIndexs()>64) { + throw new JeecgBootException("各批次仅可加64个志愿"); } //判断有没有专业Id if (StringUtils.isBlank(yxVolunteerRecord.getCalculationMajorId())) { continue; } - calculationMajor = yxCalculationMajorService.getById(yxVolunteerRecord.getCalculationMajorId()); + calculationMajor = yxCalculationMajorService.getCalculationById(activeByCreateVolunteerDto.getUserScoreInfo().getCalculationTableName() ,yxVolunteerRecord.getCalculationMajorId()); if (calculationMajor == null) { continue; }