From ab334e0e0328021041a9d22207b0b19c70767d26 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 26 Jun 2025 14:02:44 +0800
Subject: [PATCH] updates

---
 .../org/jeecg/modules/yx/controller/YxScoreController.java | 3 ++-
 .../jeecg/modules/yx/mapper/YxCalculationMajorMapper.java  | 2 ++
 .../modules/yx/mapper/xml/YxCalculationMajorMapper.xml     | 5 +++++
 .../modules/yx/service/IYxCalculationMajorService.java     | 2 ++
 .../yx/service/impl/YxCalculationMajorServiceImpl.java     | 7 ++++++-
 5 files changed, 17 insertions(+), 2 deletions(-)

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 db32264..9659f22 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
@@ -243,7 +243,8 @@ public class YxScoreController {
         LambdaUpdateWrapper<YxCalculationMajor> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.eq(YxCalculationMajor::getScoreId,scoreId);
         updateWrapper.set(YxCalculationMajor::getScoreId,bakScoreId);
-        yxCalculationMajorService.update(updateWrapper);
+        yxCalculationMajorService.updateScoreId(yxUserScore.getCalculationTableName() ,scoreId, bakScoreId);
+        // yxCalculationMajorService.update(updateWrapper);
         try {
             // 重新计算专业
             List<RecommendMajorDTO> recommendMajorDTOList = yxCalculationMajorService.calculationMajor(yxUserScore);
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 808e6e6..a636cd5 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
@@ -26,4 +26,6 @@ public interface YxCalculationMajorMapper extends BaseMapper<YxCalculationMajor>
     List<String> groupByBatchNumber(@Param(value = "tableName")String tableName,@Param("queryvo") QueryRecommendMajorVO queryRecommendMajorVO);
 
     YxCalculationMajor getCalculationById(@Param("calculationTableName") String calculationTableName, @Param("calculationMajorId") String calculationMajorId);
+
+    int updateScoreId(@Param("calculationTableName") String calculationTableName,@Param("scoreId") String scoreId,@Param("bakScoreId") String bakScoreId);
 }
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 19dd4e3..578c1f1 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
@@ -32,6 +32,11 @@
             )
         </foreach>
     </insert>
+    <update id="updateScoreId">
+        UPDATE ${calculationTableName}
+        SET score_id = #{scoreId}
+        WHERE score_id = #{bakScoreId}
+    </update>
 
     <select id="recommendMajorList" resultType="org.jeecg.modules.web.dto.RecommendMajorDTO">
         SELECT
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 b4c68d2..76cb238 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
@@ -64,4 +64,6 @@ public interface IYxCalculationMajorService extends IService<YxCalculationMajor>
     List<String> groupByBatchNumber(QueryRecommendMajorVO queryRecommendMajorVO);
 
     YxCalculationMajor getCalculationById(String calculationTableName, String calculationMajorId);
+
+    boolean updateScoreId(String calculationTableName, String scoreId, String bakScoreId);
 }
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 40833e9..a1cda02 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
@@ -472,6 +472,11 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
         return baseMapper.getCalculationById(calculationTableName, calculationMajorId);
     }
 
+    @Override
+    public boolean updateScoreId(String calculationTableName, String scoreId, String bakScoreId) {
+        return baseMapper.updateScoreId(calculationTableName, scoreId, bakScoreId) >= 1;
+    }
+
     private void setSchoolTagsList(List<RecommendMajorDTO> recommendMajorList) {
         if (CollectionUtils.isNotEmpty(recommendMajorList)) {
             Set<String> schoolIdSet = recommendMajorList.stream().map(RecommendMajorDTO::getSchoolId).collect(Collectors.toSet());
@@ -604,7 +609,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
                         recommendMajorDTO.setEnrollProbability(YxConstant.bigDecimal0);
                         continue;
                     }
-                    if("5000".equals(recommendMajorDTO.getSchoolCode())){
+                    if("6195".equals(recommendMajorDTO.getSchoolCode()) && "高职高专".equals(recommendMajorDTO.getBatch())){
                         System.out.println("qvq");
                     }