1.优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiCheckingOutController.java

@@ -128,7 +128,7 @@ public class ApiCheckingOutController {
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
-                            mallMemberUserService.updateRate(mallMemberUser.getId(), mallMemberUser.getCultureScore(), mallMemberUser.getMajorScore());
+                            mallMemberUserService.updateRate(mallMemberUser.getId(), mallMemberUser.getCultureScore(), mallMemberUser.getMajorScore(), mallMemberUser.getSubjectType());
                         }
                     }).start();
                 }

ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,7 @@ spring:
             # 主库数据源
             master:
                 # 本地数据源
-#                url: jdbc:mysql://localhost:3306/yikaozhiyuan_20250603?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+#                url: jdbc:mysql://localhost:3306/yikaozhiyuan_20250623?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
 #                username: root
 #                password: 123456
                 # 正式数据源

ruoyi-system/src/main/java/com/ruoyi/mall/domain/Bo/SchoolMajorLinkBO.java

@@ -21,11 +21,9 @@ public class SchoolMajorLinkBO {
     @Excel(name = "专业名称")
     private String majorName;
 
-
-    @Excel(name="批次")
+    @Excel(name = "批次")
     private String batchName;
 
-
     @Excel(name = "专业一级分类")
     private String parentMajorClass;
 
@@ -40,14 +38,6 @@ public class SchoolMajorLinkBO {
         this.linkId = linkId;
     }
 
-    public String getBatchName() {
-        return batchName;
-    }
-
-    public void setBatchName(String batchName) {
-        this.batchName = batchName;
-    }
-
     public String getSchoolName() {
         return schoolName;
     }
@@ -64,6 +54,14 @@ public class SchoolMajorLinkBO {
         this.majorName = majorName;
     }
 
+    public String getBatchName() {
+        return batchName;
+    }
+
+    public void setBatchName(String batchName) {
+        this.batchName = batchName;
+    }
+
     public String getParentMajorClass() {
         return parentMajorClass;
     }

ruoyi-system/src/main/java/com/ruoyi/mall/domain/Bo/ZhuankeBO.java

@@ -30,9 +30,15 @@ public class ZhuankeBO implements Serializable {
     @Excel(name = "录取原则")
     private String ruleStr;
 
-    @Excel(name = "23年录取最低分")
+    @Excel(name="参考分")
+    private BigDecimal reference;
+
+    @Excel(name = "录取最低分")
     private BigDecimal acceptLowest;
 
+    @Excel(name = "年份")
+    private String acceptYear;
+
     @Excel(name = "学科")
     private String subjectType;
 
@@ -88,12 +94,12 @@ public class ZhuankeBO implements Serializable {
         this.ruleStr = ruleStr;
     }
 
-    public String getSubjectType() {
-        return subjectType;
+    public BigDecimal getReference() {
+        return reference;
     }
 
-    public void setSubjectType(String subjectType) {
-        this.subjectType = subjectType;
+    public void setReference(BigDecimal reference) {
+        this.reference = reference;
     }
 
     public BigDecimal getAcceptLowest() {
@@ -104,6 +110,22 @@ public class ZhuankeBO implements Serializable {
         this.acceptLowest = acceptLowest;
     }
 
+    public String getAcceptYear() {
+        return acceptYear;
+    }
+
+    public void setAcceptYear(String acceptYear) {
+        this.acceptYear = acceptYear;
+    }
+
+    public String getSubjectType() {
+        return subjectType;
+    }
+
+    public void setSubjectType(String subjectType) {
+        this.subjectType = subjectType;
+    }
+
     public BigDecimal getPrice() {
         return price;
     }

ruoyi-system/src/main/java/com/ruoyi/mall/service/IMallMemberUserService.java

@@ -57,7 +57,7 @@ public interface IMallMemberUserService
     public int deleteMallMemberUserByIds(Long[] ids);
 
 
-    public void updateRate(Long userId, Integer cultureScore, Integer majorScore);
+    public void updateRate(Long userId, Integer cultureScore, Integer majorScore, String subjectType);
 
     /**
      * 删除用户会员信息

ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/CheckingOutServiceImpl.java

@@ -740,14 +740,32 @@ public class CheckingOutServiceImpl implements CheckingOutService {
                 r.put("rateType", -2);
             }
         }else{
+
             // 本科
             mallSchoolAccept = mallSchoolAcceptMapper.selectMinReferenceBySchoolId(s.getSchoolId(), bo.getBatchId(), subjectType);
             if(ObjectUtils.isNotEmpty(mallSchoolAccept)){
                 r = mallCountMethodService.getAcceptRateForReport(mallSchoolAccept.getReference(),  mallSchoolAccept.getAcceptRuleId(), cultureScore, majorScore);
-            }else{
+            }else {
                 r.put("acceptRate", 0);
                 r.put("rateType", -2);
             }
+
+//            boolean flag = false;
+//            // 选科：0-文科，1-理科
+//            if (subjectType.equals("0") && cultureScore >= 331 && majorScore >= 193) {
+//                flag = true;
+//            }else if (subjectType.equals("1") && cultureScore >= 328 && majorScore >= 193){
+//                flag = true;
+//            }
+
+            // 本科
+//            mallSchoolAccept = mallSchoolAcceptMapper.selectMinReferenceBySchoolId(s.getSchoolId(), bo.getBatchId(), subjectType);
+//            if(flag && ObjectUtils.isNotEmpty(mallSchoolAccept)){
+//                r = mallCountMethodService.getAcceptRateForReport(mallSchoolAccept.getReference(),  mallSchoolAccept.getAcceptRuleId(), cultureScore, majorScore);
+//            }else {
+//                r.put("acceptRate", 0);
+//                r.put("rateType", -2);
+//            }
         }
 
 

ruoyi-system/src/main/java/com/ruoyi/mall/service/impl/MallMemberUserServiceImpl.java

@@ -141,7 +141,9 @@ public class MallMemberUserServiceImpl implements IMallMemberUserService
     @Transactional(rollbackFor = Exception.class)
     public int updateMallMemberUser(MallMemberUser mallMemberUser)
     {
-        if (StringUtils.isNotBlank(mallMemberUser.getSubjectType()) && ObjectUtils.isNotEmpty(mallMemberUser.getCultureScore()) && ObjectUtils.isNotEmpty(mallMemberUser.getMajorScore())){
+        if (StringUtils.isNotBlank(mallMemberUser.getSubjectType())
+                && null != mallMemberUser.getCultureScore()
+                && null != mallMemberUser.getMajorScore()){
             String newSubjectType = mallMemberUser.getSubjectType();       // 新学科
             Integer newCultureScore = mallMemberUser.getCultureScore();  // 新文化分
             Integer newMajorScore = mallMemberUser.getMajorScore();      // 新专业分
@@ -161,7 +163,7 @@ public class MallMemberUserServiceImpl implements IMallMemberUserService
                     @Override
                     public void run() {
 
-                        updateRate(mallMemberUser.getId(), newCultureScore, newMajorScore);
+                        updateRate(mallMemberUser.getId(), newCultureScore, newMajorScore, newSubjectType);
                     }
                 }).start();
             }
@@ -174,7 +176,7 @@ public class MallMemberUserServiceImpl implements IMallMemberUserService
 
 
     @Override
-    public void updateRate(Long userId, Integer cultureScore, Integer majorScore)
+    public void updateRate(Long userId, Integer cultureScore, Integer majorScore, String subjectType)
     {
             // 计算学生各种录取率下的成绩
             List<MallAcceptRule> rules = acceptRuleMapper.selectNewAcceptRule();

ruoyi-system/src/main/resources/mapper/mall/MallSchoolMapper.xml

@@ -91,7 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                ms.suggest_id, ms.accept_premise, msl.config_level_id ,msl.config_level_name, ms.doctorate_type,
                ms.masters_degree_type,ms.is_new_accept, ms.has_new_link, ms.is_change, ms.no_plan,ms.qr_code, ms.sys_user_id
         from mall_school ms
-        left join mall_school_level msl on msl.school_id = ms.school_id
+        left join mall_config_level msl on msl.config_level_id = ms.config_type_id
         <where>
             <if test="schoolName != null  and schoolName != ''"> and ms.school_name like concat('%', #{schoolName}, '%')</if>
             <if test="schoolIcon != null  and schoolIcon != ''"> and ms.school_icon = #{schoolIcon}</if>
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="suggestId != null "> and ms.suggest_id = #{suggestId}</if>
             <if test="configLevelId != null "> and msl.config_level_id = #{configLevelId}</if>
             and ms.del_flag = '0'
-            and msl.del_flag = '0'
+#             and msl.del_flag = '0'
         </where>
         order by  ms.create_at asc, ms.school_number asc
     </select>