From a64d60a8d4d1f05c311a449ee6bfe1b25b6d83c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E?= <3154396966@qq.com>
Date: Wed, 27 Aug 2025 10:41:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=91=E5=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/disciplinary/EJXYSJListener.java | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
index 8f48c95..b3dac44 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/disciplinary/EJXYSJListener.java
@@ -26,29 +26,34 @@ public class EJXYSJListener implements ExecutionListener {
         if (userId!=null){
             delegateExecution.setVariable("approval", userId);
             // todo 企业微信推送消息
-// --- 企业微信推送消息模块 ---
+            /**
+             * 庞世斌
+             */
             try {
-                // 步骤 2: 【关键】使用 userId 查询对应的企业微信账号 (userName)
+                // 步骤 2: 使用 userId 查询对应的企业微信账号 (userName)
                 String userName = disciplinaryMapper.getUserNameByUserId(userId);
 
-                // 步骤 3: 检查 userName 是否存在
+                // 步骤 3: 检查是否成功获取到 userName
                 if (userName != null && !userName.isEmpty()) {
                     WeChatUtil weChatUtil = SpringUtils.getBean(WeChatUtil.class);
 
                     // 构造包含超链接的消息内容
-                    String content = "您有一条新的学生违纪审批任务待处理，<a href='http://zhxg.gxsdxy.cn/web/#/pages/Approval/index'>请点击前往处理</a>。";
+                    String content = "您有一条新的学生违纪审批任务待处理，" +
+                            "<a href='http://zhxg.gxsdxy.cn/web/#/pages/Approval/index'>请点击前往处理</a>";
 
-                    // 步骤 4: 【关键】使用 userName 作为接收人发送消息
+                    // 步骤 4: 使用 userName 作为接收人发送消息
                     weChatUtil.sendTextMessage(userName, content);
-                    log.info("已成功向二级学院书记(userName:{})发送企业微信审批通知。", userName);
+                    log.info("已成功向学务干事(userName:{})发送企业微信审批通知。", userName);
+
                 } else {
                     // 如果找不到userName，记录警告日志，但流程继续
-                    log.warn("找到了二级学院书记审批人(userId:{})，但其对应的企业微信账号(userName)为空，无法发送通知。", userId);
+                    log.warn("找到了审批人(userId:{})，但其对应的企业微信账号(userName)为空，无法发送通知。", userId);
                 }
             } catch (Exception e) {
-                // 保证即使通知失败，流程也能继续
-                log.error("向二级学院书记(userId:{})发送企业微信通知时出现异常。流程将继续。错误详情: {}", userId, e.getMessage(), e);
+                // 捕获所有异常，仅记录日志，确保主流程不受影响
+                log.error("向学务干事(userId:{})发送企业微信通知时出现异常，但流程将继续。错误详情: {}", userId, e.getMessage(), e);
             }
+
         }else{
             throw new RuntimeException("该二级学院书记审批人未配置");
         }

From c3eb8d104532e69ec0e809f2733343a9c234f152 Mon Sep 17 00:00:00 2001
From: firefly <1633489380@qq.com>
Date: Wed, 27 Aug 2025 15:05:43 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E5=AD=A6?=
 =?UTF-8?q?=E5=B7=A5=C2=B7=E8=BE=85=E5=AF=BC=E5=91=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E8=80=83=E6=A0=B8-=E7=A7=91=E5=AE=A4?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=A1-=E5=AD=A6=E5=B7=A5=E5=A4=84=E9=95=BF?=
 =?UTF-8?q?=E8=BF=99=E4=B8=A4=E4=B8=AA=E8=A7=92=E8=89=B2=E7=9A=84=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/comprehensive/CphGoodApplyMapper.xml      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index 34960d9..ff395af 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -528,18 +528,6 @@
         select concat('zsg-',count(a.id)) as `all`
         from knzz_zsg_apply as a
         where a.apply_status = 3
-        #         宁博-辅导员管理--成果绩效----待办 (第3步：科室复核 和 第4步：学工处长终审)
-        union
-        select concat('cg-',count(a.check_id)) as `all`
-        from sys_teacher_achievementcheck as a
-        left join sys_user as b on a.teacher_id = b.user_name
-        where a.check_status in (3, 4)
-        -- 陈冠元 辅导员业绩考核-科室复核待办-学工处长审核待办
-        union
-        select concat('yj-',count(a.id)) as `all`
-        from sys_teacher_kpi_filling as a
-        left join sys_user as b on a.job_number = b.user_name
-        where a.role_audit in (3, 4)
     </select>
 
     <select id="countStuUnDo" resultType="String" parameterType="String">

From 2a06dc8a847d359a270b1193675207cfac8f0ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=9E?= <3154396966@qq.com>
Date: Wed, 27 Aug 2025 15:20:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=91=E5=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java
index f09faf8..4a47cf1 100644
--- a/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java
+++ b/srs-routine/src/main/java/com/srs/routine/service/impl/RtStuQuitSchoolServiceImpl.java
@@ -114,7 +114,7 @@ public class RtStuQuitSchoolServiceImpl extends ServiceImpl<RtStuQuitSchoolMappe
         variables.put("approval", SecurityUtils.getUserId());
         variables.put("deptId", SecurityUtils.getDeptId());
 
-        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_vxuubvdh:5:347504", variables);
+        AjaxResult ajaxResult = flowDefinitionService.startProcessInstanceById("flow_vxuubvdh:13:835109", variables);
         String code = ajaxResult.get("code").toString();
         if (code.equals("200")) {
 

From ca09add9b0ceb618bd1e3e1bfa79a6d289550fc1 Mon Sep 17 00:00:00 2001
From: MDSMO <MDSMO@2033292787@qq.com>
Date: Wed, 27 Aug 2025 15:36:48 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=9B=B0?=
 =?UTF-8?q?=E9=9A=BE=E6=A8=A1=E5=9D=97=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/comprehensive/KnzzGlApplyMapper.xml     | 13 +++++++------
 .../mapper/comprehensive/KnzzTufaApplyMapper.xml   | 13 +++++++------
 .../mapper/comprehensive/KnzzZsgApplyMapper.xml    | 13 +++++++------
 .../mapper/comprehensive/KnzzZzqApplyMapper.xml    | 13 +++++++------
 .../mapper/comprehensive/SrsKnrdApplyMapper.xml    |  3 ++-
 .../comprehensive/SrsKnrdApprovalRecordMapper.xml  |  2 +-
 .../mapper/comprehensive/SrsKnrdTimeMapper.xml     | 13 +++++++------
 .../mapper/comprehensive/SrsKnrdTypeMapper.xml     |  3 ++-
 .../mapper/comprehensive/SrsZxjApplyMapper.xml     |  2 +-
 .../comprehensive/SrsZxjApprovalRecordMapper.xml   | 14 +++++++-------
 .../mapper/comprehensive/SrsZxjTimeMapper.xml      |  3 ++-
 11 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml
index f7fe94d..89f6a57 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzGlApplyMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.KnzzGlApplyMapper">
-    
+
     <resultMap type="KnzzGlApply" id="KnzzGlApplyResult">
         <result property="id"    column="id"    />
         <result property="stuYearId"    column="stu_year_id"    />
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectKnzzGlApplyList" parameterType="KnzzGlApply" resultMap="KnzzGlApplyResult">
         <include refid="selectKnzzGlApplyVo"/>
-        <where>  
+        <where>
             <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
             <if test="stuNo != null  and stuNo != ''"> and stu_no = #{stuNo}</if>
             <if test="stuName != null  and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
@@ -112,13 +112,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="xgNo != null  and xgNo != ''"> and xg_no = #{xgNo}</if>
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
         </where>
+        order by id desc
     </select>
-    
+
     <select id="selectKnzzGlApplyById" parameterType="Long" resultMap="KnzzGlApplyResult">
         <include refid="selectKnzzGlApplyVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertKnzzGlApply" parameterType="KnzzGlApply" useGeneratedKeys="true" keyProperty="id">
         insert into knzz_gl_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -289,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteKnzzGlApplyByIds" parameterType="String">
-        delete from knzz_gl_apply where id in 
+        delete from knzz_gl_apply where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -317,4 +318,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.id desc
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml
index 1053e31..6eb6d1e 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzTufaApplyMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.KnzzTufaApplyMapper">
-    
+
     <resultMap type="KnzzTufaApply" id="KnzzTufaApplyResult">
         <result property="id"    column="id"    />
         <result property="stuNo"    column="stu_no"    />
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectKnzzTufaApplyList" parameterType="KnzzTufaApply" resultMap="KnzzTufaApplyResult">
         <include refid="selectKnzzTufaApplyVo"/>
-        <where>  
+        <where>
             <if test="stuNo != null  and stuNo != ''"> and stu_no = #{stuNo}</if>
             <if test="stuName != null  and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
             <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
@@ -98,13 +98,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="leaderNo != null  and leaderNo != ''"> and leader_no = #{leaderNo}</if>
             <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
         </where>
+        order by id desc
     </select>
-    
+
     <select id="selectKnzzTufaApplyById" parameterType="Long" resultMap="KnzzTufaApplyResult">
         <include refid="selectKnzzTufaApplyVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertKnzzTufaApply" parameterType="KnzzTufaApply" useGeneratedKeys="true" keyProperty="id">
         insert into knzz_tufa_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -254,7 +255,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteKnzzTufaApplyByIds" parameterType="String">
-        delete from knzz_tufa_apply where id in 
+        delete from knzz_tufa_apply where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -283,4 +284,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml
index 40db5cb..bc24e76 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZsgApplyMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.KnzzZsgApplyMapper">
-    
+
     <resultMap type="KnzzZsgApply" id="KnzzZsgApplyResult">
         <result property="id"    column="id"    />
         <result property="stuName"    column="stu_name"    />
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectKnzzZsgApplyList" parameterType="KnzzZsgApply" resultMap="KnzzZsgApplyResult">
         <include refid="selectKnzzZsgApplyVo"/>
-        <where>  
+        <where>
             <if test="stuName != null  and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
             <if test="gender != null  and gender != ''"> and gender = #{gender}</if>
             <if test="birthMonth != null  and birthMonth != ''"> and birth_month = #{birthMonth}</if>
@@ -110,13 +110,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyFile != null  and applyFile != ''"> and apply_file = #{applyFile}</if>
             <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
         </where>
+        order by id desc
     </select>
-    
+
     <select id="selectKnzzZsgApplyById" parameterType="Long" resultMap="KnzzZsgApplyResult">
         <include refid="selectKnzzZsgApplyVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertKnzzZsgApply" parameterType="KnzzZsgApply" useGeneratedKeys="true" keyProperty="id">
         insert into knzz_zsg_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -286,7 +287,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteKnzzZsgApplyByIds" parameterType="String">
-        delete from knzz_zsg_apply where id in 
+        delete from knzz_zsg_apply where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -314,4 +315,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml
index 9e2b0c8..cb4c829 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/KnzzZzqApplyMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.KnzzZzqApplyMapper">
-    
+
     <resultMap type="KnzzZzqApply" id="KnzzZzqApplyResult">
         <result property="id"    column="id"    />
         <result property="stuYearId"    column="stu_year_id"    />
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectKnzzZzqApplyList" parameterType="KnzzZzqApply" resultMap="KnzzZzqApplyResult">
         <include refid="selectKnzzZzqApplyVo"/>
-        <where>  
+        <where>
             <if test="stuYearId != null "> and stu_year_id = #{stuYearId}</if>
             <if test="stuNo != null  and stuNo != ''"> and stu_no = #{stuNo}</if>
             <if test="stuName != null  and stuName != ''"> and stu_name like concat('%', #{stuName}, '%')</if>
@@ -96,13 +96,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="applyStatus != null  and applyStatus != ''"> and apply_status = #{applyStatus}</if>
             <if test="applyFile != null  and applyFile != ''"> and apply_file = #{applyFile}</if>
         </where>
+        order by id desc
     </select>
-    
+
     <select id="selectKnzzZzqApplyById" parameterType="Long" resultMap="KnzzZzqApplyResult">
         <include refid="selectKnzzZzqApplyVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertKnzzZzqApply" parameterType="KnzzZzqApply" useGeneratedKeys="true" keyProperty="id">
         insert into knzz_zzq_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -243,7 +244,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteKnzzZzqApplyByIds" parameterType="String">
-        delete from knzz_zzq_apply where id in 
+        delete from knzz_zzq_apply where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -272,4 +273,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml
index 404cf5e..e1618ae 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApplyMapper.xml
@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="majorId != null ">and d.major_id = #{majorId}</if>
             <if test="classId != null ">and c.class_id = #{classId}</if>
         </where>
-        order by a.id asc
+        order by a.id desc
     </select>
 
     <select id="countXw"  parameterType="CphSearch" resultType="SrsKnrdApply">
@@ -185,6 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="classId != null ">and c.class_id = #{classId}</if>
         </where>
         group by ejxyldqmyj
+        order by a.id desc
 
     </select>
 
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml
index 154ed09..8c60228 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdApprovalRecordMapper.xml
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="yj != null "> and (a.bjpyyj = #{yj} or a.ejxyldqmyj = #{yj} or xsqmyj = #{yj})</if>
             <if test="applyYear != null "> and a.apply_year like CONCAT('%',#{applyYear},'%')</if>
 
-        order by a.id asc
+        order by a.id desc
     </select>
     <select id="selectSrsKnrdApprovalRecordByIds" resultType="SrsKnrdApprovalRecord">
         select * from srs_knrd_approval_record where apply_id=#{id}
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTimeMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTimeMapper.xml
index 528d917..a0254ea 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTimeMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTimeMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.SrsKnrdTimeMapper">
-    
+
     <resultMap type="SrsKnrdTime" id="SrsKnrdTimeResult">
         <result property="id"    column="id"    />
         <result property="stuNo"    column="stu_no"    />
@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSrsKnrdTimeList" parameterType="SrsKnrdTime" resultMap="SrsKnrdTimeResult">
         <include refid="selectSrsKnrdTimeVo"/>
-        <where>  
+        <where>
             <if test="stuNo != null  and stuNo != ''"> and a.stu_no = #{stuNo}</if>
             <if test="stuTime != null "> and a.stu_time = #{stuTime}</if>
             <if test="fdyTime != null "> and a.fdy_time = #{fdyTime}</if>
@@ -36,13 +36,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stuYearId != null "> and a.stu_year_id = #{stuYearId}</if>
             <if test="term != null  and term != ''"> and a.term = #{term}</if>
         </where>
+        order by a.id desc
     </select>
-    
+
     <select id="selectSrsKnrdTimeById" parameterType="Long" resultMap="SrsKnrdTimeResult">
         <include refid="selectSrsKnrdTimeVo"/>
         where a.id = #{id}
     </select>
-        
+
     <insert id="insertSrsKnrdTime" parameterType="SrsKnrdTime" useGeneratedKeys="true" keyProperty="id">
         insert into srs_knrd_time
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -84,9 +85,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSrsKnrdTimeByIds" parameterType="String">
-        delete from srs_knrd_time where id in 
+        delete from srs_knrd_time where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml
index b26b7aa..1fd1a3f 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsKnrdTypeMapper.xml
@@ -27,6 +27,7 @@
             <if test="knrdType != null  and knrdType != ''">and a.knrd_type = #{knrdType}</if>
             <if test="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if>
         </where>
+        order by a.id desc
     </select>
 
     <select id="selectSrsKnrdTypeById" parameterType="Long" resultMap="SrsKnrdTypeResult">
@@ -70,4 +71,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
index 539fabf..54ccb48 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApplyMapper.xml
@@ -307,7 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and (a.status1 =  #{status} or a.status2 = #{status} or a.status3 = #{status})</if>
             <if test="applyYear != null"> and a.apply_year like CONCAT('%',#{applyYear},'%')</if>
         </where>
-        order by a.id asc
+        order by a.id desc
     </select>
 
     <insert id="insertSrsZxjApply" parameterType="SrsZxjApply" useGeneratedKeys="true" keyProperty="id">
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml
index 5b926c0..85e32c4 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjApprovalRecordMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.comprehensive.mapper.SrsZxjApprovalRecordMapper">
-    
+
     <resultMap type="SrsZxjApprovalRecord" id="SrsZxjApprovalRecordResult">
         <result property="id"    column="id"    />
         <result property="step"    column="step"    />
@@ -24,19 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectSrsZxjApprovalRecordList" parameterType="SrsZxjApprovalRecord" resultMap="SrsZxjApprovalRecordResult">
         <include refid="selectSrsZxjApprovalRecordVo"/>
-        <where>  
+        <where>
             <if test="step != null "> and step = #{step}</if>
             <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
             <if test="applyId != null "> and apply_id = #{applyId}</if>
         </where>
     </select>
-    
+
     <select id="selectSrsZxjApprovalRecordById" parameterType="Long" resultMap="SrsZxjApprovalRecordResult">
         <include refid="selectSrsZxjApprovalRecordVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertSrsZxjApprovalRecord" parameterType="SrsZxjApprovalRecord" useGeneratedKeys="true" keyProperty="id">
         insert into srs_zxj_approval_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -88,14 +88,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="operator != null ">and r.operator like concat('%',#{operator},'%')</if>
             <if test="status != null"> and r.status = #{status}</if>
 
-        order by a.id asc
+        order by a.id desc
     </select>
     <delete id="deleteSrsZxjApprovalRecordById" parameterType="Long">
         delete from srs_zxj_approval_record where id = #{id}
     </delete>
 
     <delete id="deleteSrsZxjApprovalRecordByIds" parameterType="String">
-        delete from srs_zxj_approval_record where id in 
+        delete from srs_zxj_approval_record where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
@@ -107,4 +107,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml
index 6579db1..bb9f1c0 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/SrsZxjTimeMapper.xml
@@ -43,6 +43,7 @@
             <if test="stuYearId != null ">and a.stu_year_id = #{stuYearId}</if>
             <if test="term != null  and term != ''">and a.term = #{term}</if>
         </where>
+        order by a.id desc
     </select>
 
     <select id="selectSrsZxjTimeById" parameterType="Long" resultMap="SrsZxjTimeResult">
@@ -98,4 +99,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>

From 3ba997de771ecd51304f43fd737be1e9dadae138 Mon Sep 17 00:00:00 2001
From: s1431_z_w <15596413+s1431zw@user.noreply.gitee.com>
Date: Wed, 27 Aug 2025 16:34:47 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=BF=E8=88=8D=E8=B4=B9=E7=94=A8?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E5=BE=85=E5=8A=9E=E5=92=8C=E5=AE=BF=E8=88=8D?=
 =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/dormitory/DmsNewRecordMapper.xml | 1 +
 .../resources/mapper/comprehensive/CphGoodApplyMapper.xml  | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml
index 6e44767..d02f639 100644
--- a/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml
+++ b/dms-dormitory/src/main/resources/mapper/dormitory/DmsNewRecordMapper.xml
@@ -37,6 +37,7 @@
             where a2.apply_status != 1
             ) as t1
             <where>
+                t1.apply_status = 1 or t1.apply_status = 2 or t1.apply_status = 3
                 <if test="stuNo != null  and stuNo != ''">and t1.stu_no = #{stuNo}</if>
                 <if test="roomId != null ">and t1.room_id = #{roomId}</if>
                 <if test="startDate != null ">and t1.start_date = #{startDate}</if>
diff --git a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
index ff395af..dfd25a4 100644
--- a/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
+++ b/srs-comprehensive/src/main/resources/mapper/comprehensive/CphGoodApplyMapper.xml
@@ -772,9 +772,10 @@
         -- 邵政文-(宿舍管理-住宿费用-辅导员确认待办)
         union
         select concat('zsfy-',count(a.id)) as `all`
-        from dms_new_record as a
-        left join view_dms_record as d on a.stu_no = d.stu_no
-        where  d.employee_id = #{tNo} and a.apply_status = 6 and a.apply_status = 1
+        from view_dms_record as a
+        left join dms_new_record as b on a.stu_year_id = b.id
+        left join view_stu_info as d on a.stu_no = d.stu_no
+        where d.t_no = #{tNo} and a.apply_status = 1
     </select>