From 547875b13d3374a676f1a6905764d28491928a38 Mon Sep 17 00:00:00 2001
From: "962704835@qq.com" <lfvv96270@qq.com>
Date: Fri, 12 Dec 2025 22:21:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E4=BC=8D=E7=94=B3=E8=AF=B7-=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E8=81=94=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApprovalAssigneeListener.java             | 23 +++++++++---
 .../routine/domain/RtEnlistmentReserve.java   |  6 ++--
 .../RtEnlistmentReserveAttachMapper.xml       | 36 ++++++++++++++++++-
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java
index eeec62f..c155a2c 100644
--- a/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java
+++ b/srs-flowable/src/main/java/com/srs/flowable/listener/enlistmentReserve/ApprovalAssigneeListener.java
@@ -70,18 +70,33 @@ public class ApprovalAssigneeListener implements ExecutionListener {
             approvalResult = num.longValue();
         }
 
-        // 添加审批记录
         EnlistmentReserveMapper rtEnlistmentReserveMapper = (EnlistmentReserveMapper) SpringUtils.getBean(EnlistmentReserveMapper.class);
         // 根据Id查询入伍申请记录
         EnlistmentReserve enlistmentReserve = rtEnlistmentReserveMapper.selectRtEnlistmentReserveById(enlistmentId);
+        // 添加审批记录
         saveApprovalRecord(enlistmentReserve.getId(), enlistmentReserve.getProcessInstanceId(),currentActivityId,currentNodeName, enlistmentReserve.getStudentName(), enlistmentReserve.getStudentNo(), approvalOpinion, approvalResult);
 
+        Long status = 1L;
+        if (currentNodeName.equals("辅导员审批")) {
+            status = 2L;
+        }
+        if (currentNodeName.equals("学务审批")) {
+            status = 3L;
+        }
+        if (currentNodeName.equals("二级学院审批")) {
+            status = 4L;
+        }
+        if (currentNodeName.equals("学籍管理科审批")){
+            // 改变申请表中的审核状态（审核通过）
+            status = 5L;
+        }
         // 如果到了最后一个审批人，则修改申请表审核状态
         if (currentNodeName.equals("教务处主管领导审批")){
-            // 改变申请表中的审核状态（审核通过）
-            enlistmentReserve.setApplyStatus(2L);
-            rtEnlistmentReserveMapper.updateRtEnlistmentReserve(enlistmentReserve);
+            status = 6L;
         }
+        // 改变申请表中的审核状态（审核通过）
+        enlistmentReserve.setApplyStatus(status);
+        rtEnlistmentReserveMapper.updateRtEnlistmentReserve(enlistmentReserve);
     }
 
     /**
diff --git a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java
index 5b2b0ba..49e6ec0 100644
--- a/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java
+++ b/srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserve.java
@@ -142,11 +142,11 @@ private static final long serialVersionUID=1L;
     private String applyReason;
 
     /**
-     * 申请状态（0-草稿
+     * 申请状态（0-草稿，1=待辅导员审批，2=待学务审批，3=待二级学院审批，4=待学籍管理科审批，5=待教务处主管领导审批，6=审批通过，7=驳回）
      */
-    @ApiModelProperty("申请状态（0-草稿 1-审批中 2-通过 3-驳回）")
+    @ApiModelProperty("申请状态（0-草稿，1=待辅导员审批，2=待学务审批，3=待二级学院审批，4=待学籍管理科审批，5=待教务处主管领导审批，6=审批通过，7=驳回）")
     @TableField("apply_status")
-    @Excel(name = "申请状态" , readConverterExp = "申请状态（0-草稿 1-审批中 2-通过 3-驳回）")
+    @Excel(name = "申请状态" , readConverterExp = "0=-草稿，1=待辅导员审批，2=待学务审批，3=待二级学院审批，4=待学籍管理科审批，5=待教务处主管领导审批，6=审批通过，7=驳回")
     private Long applyStatus;
 
     /**
diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
index 31b134d..370f133 100644
--- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveAttachMapper.xml
@@ -15,7 +15,7 @@
         <result property="applyNo" column="apply_no"/>
         <result property="studentName" column="student_name"/>
         <result property="studentNo" column="student_no"/>
-        <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
+        <!--入伍保留学籍申请表 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
         <collection property="rtEnlistmentReserves"
                     column="{studentName = student_name, studentNo = student_no, id = apply_id}"
                     javaType="java.util.ArrayList" select="selectRtEnlistmentReserveByStuName"/>
@@ -46,6 +46,10 @@
         <result property="updateTime" column="update_time"/>
         <result property="affixId" column="affix_id"/>
         <result property="deployId"    column="deploy_id"    />
+        <!--入伍保留学籍申请表-审核记录 （多条件查询column里传入了多条件【{studentName = student_name, studentNo = student_no}】javaType里面写了list表明你有多条件 studentName student_name字段）-->
+        <collection property="enlistmentReserveApprovalList"
+                    column="{studentName = student_name, studentNo = student_no}"
+                    javaType="java.util.ArrayList" select="selectRtEnlistmentReserveApprovalByStuName"/>
     </resultMap>
 
     <!--  入伍保留申请表 -->
@@ -65,6 +69,36 @@
         </where>
     </select>
 
+    <!--入伍保留学籍申请表-审核记录子表的映射 -->
+    <resultMap type="EnlistmentReserveApproval" id="RtEnlistmentReserveApprovalResult">
+        <result property="id" column="id"/>
+        <result property="applyId" column="apply_id"/>
+        <result property="processInstanceId" column="process_instance_id"/>
+        <result property="taskId" column="task_id"/>
+        <result property="nodeName" column="node_name"/>
+        <result property="approverId" column="approver_id"/>
+        <result property="approverName" column="approver_name"/>
+        <result property="approvalOpinion" column="approval_opinion"/>
+        <result property="approvalResult" column="approval_result"/>
+        <result property="approvalTime" column="approval_time"/>
+        <result property="studentName" column="student_name"/>
+        <result property="studentNo" column="student_no"/>
+    </resultMap>
+
+    <!--  入伍保留申请表-审核记录子表，根据学生姓名、学号查询  -->
+    <select id="selectRtEnlistmentReserveApprovalByStuName" resultMap="RtEnlistmentReserveApprovalResult">
+        select *
+        from rt_enlistment_reserve_approval
+        <where>
+            <if test="studentName != null and studentName != ''">
+                and student_name = #{studentName}
+            </if>
+            <if test="studentNo != null and studentNo != ''">
+                and student_no = #{studentNo}
+            </if>
+        </where>
+    </select>
+
     <sql id="selectRtEnlistmentReserveAttachVo">
         select id,
                apply_id,