From 55ec8cd23a9da901e14fe1d186dec333456a5f52 Mon Sep 17 00:00:00 2001
From: zhouwentao <1577701412@qq.com>
Date: Thu, 8 May 2025 18:13:02 +0800
Subject: [PATCH] updates

---
 .../api/controller/StaticDataController.java  | 23 +++++++++++++---
 .../web/dto/ArtRecommendMajorBaseDTO.java     |  1 -
 .../impl/YxCalculationMajorServiceImpl.java   | 27 +------------------
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/StaticDataController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/StaticDataController.java
index 78bbffd..359fe16 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/StaticDataController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/api/controller/StaticDataController.java
@@ -11,10 +11,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.util.AssertUtils;
 import org.jeecg.modules.yx.entity.YxSportsScore;
 import org.jeecg.modules.yx.service.IYxSportsScoreService;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -64,6 +61,9 @@ public class StaticDataController {
                         return Result.OK(JSONArray.parseArray(json));
                     }
 
+                case "miniConfig":
+                    return Result.OK(commonConfig());
+
                 case "sportsScore":
                     // 体育成绩计算器
                     Integer year = params.getInt("year");
@@ -89,4 +89,19 @@ public class StaticDataController {
 
         return Result.OK();
     }
+
+
+    /**
+     * 通用配置，如：当前年份、历年...
+     * @return
+     */
+    public JSONObject commonConfig(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.set("nowYear", 2025); // 当前年份
+        jsonObject.set("showZeSuan", false); // 是否显示折算按钮
+        jsonObject.set("tiQianPiZhiYuanNum", 1);
+        jsonObject.set("benZhiYuanNum", 64);
+        jsonObject.set("zhuanZhiYuanNum", 64);
+        return jsonObject;
+    }
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtRecommendMajorBaseDTO.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtRecommendMajorBaseDTO.java
index c408fbc..8f6bc16 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtRecommendMajorBaseDTO.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/dto/ArtRecommendMajorBaseDTO.java
@@ -27,7 +27,6 @@ public class ArtRecommendMajorBaseDTO implements Serializable {
     private Integer nan=0;//难
     private Integer allNumber=0;//全部数量
 
-    private List<String> haveMajorList = new ArrayList<>();
     public ArtRecommendMajorBaseDTO() {
     }
 
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 da74d44..c55dd45 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
@@ -130,13 +130,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
         }
         //获取当前分数
         YxUserScore activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
-//        if (StringUtils.isNotBlank(queryRecommendMajorVO.getScoreId())) {
-//            //是根据成绩单来的
-//            activeCurrentUserScore = yxUserScoreService.findById(queryRecommendMajorVO.getScoreId());
-//        } else {
-//            //直接获取当前使用中的成绩单
-//            activeCurrentUserScore = yxUserScoreService.getActiveCurrentUserScore();
-//        }
         queryRecommendMajorVO.setScoreId(activeCurrentUserScore.getId());
         //文理分科
         queryRecommendMajorVO.setCognitioPolyclinic(activeCurrentUserScore.getCognitioPolyclinic());
@@ -173,9 +166,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
             queryRecommendMajorVO.setRulesEnrollProbabilityList(Arrays.asList(rulesEnrollProbability.split(",")));
         }
 
-        //获取推荐志愿信息service
-//        List<String> haveMajorList = baseMapper.groupByBatchNumber(activeCurrentUserScore.getCalculationTableName(),queryRecommendMajorVO);
-
         //获取推荐志愿信息service
         List<RecommendMajorDTO> recommendMajorList = baseMapper.recommendMajorList(activeCurrentUserScore.getCalculationTableName(),queryRecommendMajorVO);
         ArtRecommendMajorBaseDTO artRecommendMajorBaseDTO = this.checkLevelNum(recommendMajorList);
@@ -231,7 +221,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
         convertRecommendMajorListToNull(recommendMajorDTOList);
         pageList.setRecords(recommendMajorDTOList);
         artRecommendMajorBaseDTO.setPageList(pageList);
-//        artRecommendMajorBaseDTO.setHaveMajorList(haveMajorList);
         return artRecommendMajorBaseDTO;
     }
 
@@ -404,13 +393,6 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
         queryRecommendMajorVO.setCognitioPolyclinic(activeCurrentUserScore.getCognitioPolyclinic());
         //专业类别
         queryRecommendMajorVO.setProfessionalCategory(activeCurrentUserScore.getProfessionalCategory());
-        //有子级专业
-//        if (StringUtils.isNotBlank(activeCurrentUserScore.getProfessionalCategoryChildren()) && !"高职高专".equals(queryRecommendMajorVO.getBatch())) {
-//            queryRecommendMajorVO.setPCategoryChildrenList(new ArrayList<>(Arrays.asList(activeCurrentUserScore.getProfessionalCategoryChildren().split(","))));
-//            if("表演类".equals(activeCurrentUserScore.getProfessionalCategory())){
-//                queryRecommendMajorVO.getPCategoryChildrenList().add("兼报");
-//            }
-//        }
         //标签类别
         if (StringUtils.isNotBlank(queryRecommendMajorVO.getTagsStrs())) {
             queryRecommendMajorVO.setTagsList(Arrays.asList(queryRecommendMajorVO.getTagsStrs().split(",")));
@@ -433,14 +415,7 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
             queryRecommendMajorVO.setRulesEnrollProbabilityList(Arrays.asList(rulesEnrollProbability.split(",")));
         }
         //获取推荐志愿信息service
-        List<String> haveMajorList = baseMapper.groupByBatchNumber(activeCurrentUserScore.getCalculationTableName(),queryRecommendMajorVO);
-        /*List<YxCalculationMajor> calculationMajorList = baseMapper.selectList(new LambdaQueryWrapper<YxCalculationMajor>()
-                .select(YxCalculationMajor::getBatch,YxCalculationMajor::getEnrollProbability)
-                .eq(YxCalculationMajor::getScoreId, activeCurrentUserScore.getId())
-                .gt(YxCalculationMajor::getEnrollProbability,60)
-                .groupBy(YxCalculationMajor::getBatch));
-        List<String> haveMajorList=new ArrayList<>();*/
-        return haveMajorList;
+        return baseMapper.groupByBatchNumber(activeCurrentUserScore.getCalculationTableName(),queryRecommendMajorVO);
     }
 
     private void setSchoolTagsList(List<RecommendMajorDTO> recommendMajorList) {