1.学校专业导入优化

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

@@ -7,9 +7,9 @@ spring:
             # 主库数据源
             master:
                 # 本地数据源
-#                url: jdbc:mysql://rm-hp3340490n5mw72tcto.mysql.huhehaote.rds.aliyuncs.com:3306/yikaozhiyuan_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
-#                username: yikaozhiyuan
-#                password: KxappNYy7dQUzuterEncvBt@Pf
+#                url: jdbc:mysql://localhost:3306/yikaozhiyuan_20250605?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+#                username: root
+#                password: 123456
                 # 正式数据源
                 url: jdbc:mysql://bj-cynosdbmysql-grp-oppabofo.sql.tencentcdb.com:29687/yikaozhiyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                 username: root

ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptPlanMapper.java

@@ -48,7 +48,7 @@ public interface MallAcceptPlanMapper
     public String selectMaxYear();
 
 
-    public MallAcceptPlan selectPlan(@Param("schoolId")Long schoolId,
+    public List<MallAcceptPlan> selectPlan(@Param("schoolId")Long schoolId,
                                      @Param("batchId")Long batchId,
                                      @Param("planYear")String planYear,
                                      @Param("subjectType")Integer subjectType,

ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallAcceptRuleMapper.java

@@ -30,6 +30,13 @@ public interface MallAcceptRuleMapper
      */
     public MallAcceptRule selectMallAcceptRuleByAcceptRuleStr(@Param("ruleStr")String ruleStr);
 
+    /**
+     * 录取字符串查询
+     * @param ruleStr 字符串
+     * @return
+     */
+    public List<MallAcceptRule> selectMallAcceptRuleByAcceptRuleStr2(@Param("ruleStr")String ruleStr);
+
     /**
      * 录取原则
      * @return

ruoyi-system/src/main/java/com/ruoyi/mall/mapper/MallSchoolAcceptMapper.java

@@ -32,7 +32,7 @@ public interface MallSchoolAcceptMapper
 
      * @return
      */
-    public MallSchoolAccept selectBySchoolIdAndLinkId(@Param("schoolId")Long schoolId,
+    public List<MallSchoolAccept> selectBySchoolIdAndLinkId(@Param("schoolId")Long schoolId,
                                                       @Param("batchId")Long batchId,
                                                       @Param("linkId")Long linkId,
                                                       @Param("acceptYear")String acceptYear,

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

@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-    <select id="selectPlan"  resultType="MallAcceptPlan">
+    <select id="selectPlan"  resultType="com.ruoyi.mall.domain.MallAcceptPlan">
         select accept_plan_id acceptPlanId,
                school_id schoolId,
                batch_id batchId,
@@ -169,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and plan_year = #{planYear}
             and subject_type = #{subjectType}
             and link_id = #{linkId} and del_flag = '0'
+        order by create_at desc
     </select>
 
     <select id="selectSchoolPrice" parameterType="Long" resultType="MallAcceptPlan">

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

@@ -55,6 +55,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and del_flag = '0'
     </select>
 
+    <select id="selectMallAcceptRuleByAcceptRuleStr2"  resultMap="MallAcceptRuleResult">
+        <include refid="selectMallAcceptRuleVo"/>
+        where rule_str = #{ruleStr}
+        and del_flag = '0'
+        order by create_at desc
+    </select>
+
     <select id="selectNewAcceptRule"  resultMap="MallAcceptRuleResult">
         <include refid="selectMallAcceptRuleVo"/>
         where  is_new = 1

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

@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where school_accept_id = #{schoolAcceptId}
     </select>
 
-    <select id="selectBySchoolIdAndLinkId" resultType="MallSchoolAccept">
+    <select id="selectBySchoolIdAndLinkId" resultType="com.ruoyi.mall.domain.MallSchoolAccept">
         select msa.school_accept_id schoolAcceptId,
                msa.school_id schoolId,
                msa.major_id majorId,
@@ -120,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and link_id = #{linkId}
             and accept_year = #{acceptYear}
             and subject_type = #{subjectType}
+        order by create_at desc
     </select>
 
     <insert id="insertMallSchoolAccept" parameterType="MallSchoolAccept" useGeneratedKeys="true" keyProperty="schoolAcceptId">

ruoyi-ui/src/views/mall/mallSchoolAccept/index.vue

@@ -139,7 +139,7 @@
           <el-input v-model="form.schoolName" placeholder="请输入学校名" />
         </el-form-item>
         <el-form-item label="批次" prop="batchId">
-          <el-select v-model="form.batchId" placeholder="请选择批次">
+          <el-select v-model="form.batchId" filterable placeholder="请选择批次">
             <el-option
               v-for="item in batchList"
               :key="item.batchId"
@@ -149,7 +149,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="专业" prop="majorId">
-          <el-select v-model="form.majorId" placeholder="请选择专业">
+          <el-select v-model="form.majorId" filterable placeholder="请选择专业">
             <el-option
               v-for="item in majorList"
               :key="item.majorId"
@@ -182,7 +182,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="录取原则" prop="acceptRuleId">
-          <el-select v-model="form.acceptRuleId" >
+          <el-select v-model="form.acceptRuleId" filterable >
             <el-option v-for="item in ruleList"
                        :value="item.acceptRuleId"
                        :key="item.acceptRuleId"