From 35259d7a15a23c6886b6b3668d628d6b387fbc7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=81=92=E6=88=90?= <962704835@qq.com>
Date: Tue, 18 Nov 2025 11:47:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E5=BE=81=E5=85=A5=E4=BC=8D=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E5=AD=A6=E7=B1=8D=E7=94=B3=E8=AF=B7=E8=A1=A8-?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RtEnlistmentReserveApprovalMapper.xml     | 85 ++++++++++++-------
 1 file changed, 55 insertions(+), 30 deletions(-)

diff --git a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml
index 4b04643..216286e 100644
--- a/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveApprovalMapper.xml
@@ -4,43 +4,63 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.srs.routine.mapper.RtEnlistmentReserveApprovalMapper">
 
-    <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 type="RtEnlistmentReserveApproval" 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>
 
     <sql id="selectRtEnlistmentReserveApprovalVo">
-        select id, apply_id, process_instance_id, task_id, node_name, approver_id, approver_name, approval_opinion, approval_result, approval_time, student_name, student_no from rt_enlistment_reserve_approval
+        select id,
+               apply_id,
+               process_instance_id,
+               task_id,
+               node_name,
+               approver_id,
+               approver_name,
+               approval_opinion,
+               approval_result,
+               approval_time,
+               student_name,
+               student_no
+        from rt_enlistment_reserve_approval
     </sql>
 
-    <select id="selectRtEnlistmentReserveApprovalList" parameterType="EnlistmentReserveApproval" resultMap="RtEnlistmentReserveApprovalResult">
+    <select id="selectRtEnlistmentReserveApprovalList" parameterType="EnlistmentReserveApproval"
+            resultMap="RtEnlistmentReserveApprovalResult">
         <include refid="selectRtEnlistmentReserveApprovalVo"/>
         <where>
-            <if test="applyId != null "> and apply_id = #{applyId}</if>
-            <if test="processInstanceId != null  and processInstanceId != ''"> and process_instance_id = #{processInstanceId}</if>
-            <if test="taskId != null  and taskId != ''"> and task_id = #{taskId}</if>
-            <if test="nodeName != null  and nodeName != ''"> and node_name like concat('%', #{nodeName}, '%')</if>
-            <if test="approverId != null "> and approver_id = #{approverId}</if>
-            <if test="approverName != null  and approverName != ''"> and approver_name like concat('%', #{approverName}, '%')</if>
-            <if test="approvalOpinion != null  and approvalOpinion != ''"> and approval_opinion = #{approvalOpinion}</if>
-            <if test="approvalResult != null "> and approval_result = #{approvalResult}</if>
-            <if test="approvalTime != null "> and approval_time = #{approvalTime}</if>
-            <if test="studentName != null  and studentName != ''"> and student_name like concat('%', #{studentName}, '%')</if>
-            <if test="studentNo != null  and studentNo != ''"> and student_no = #{studentNo}</if>
+            <if test="applyId != null ">and apply_id = #{applyId}</if>
+            <if test="processInstanceId != null  and processInstanceId != ''">and process_instance_id =
+                #{processInstanceId}
+            </if>
+            <if test="taskId != null  and taskId != ''">and task_id = #{taskId}</if>
+            <if test="nodeName != null  and nodeName != ''">and node_name like concat('%', #{nodeName}, '%')</if>
+            <if test="approverId != null ">and approver_id = #{approverId}</if>
+            <if test="approverName != null  and approverName != ''">and approver_name like concat('%', #{approverName},
+                '%')
+            </if>
+            <if test="approvalOpinion != null  and approvalOpinion != ''">and approval_opinion = #{approvalOpinion}</if>
+            <if test="approvalResult != null ">and approval_result = #{approvalResult}</if>
+            <if test="approvalTime != null ">and approval_time = #{approvalTime}</if>
+            <if test="studentName != null  and studentName != ''">and student_name like concat('%', #{studentName},
+                '%')
+            </if>
+            <if test="studentNo != null  and studentNo != ''">and student_no = #{studentNo}</if>
         </where>
     </select>
 
-    <select id="selectRtEnlistmentReserveApprovalById" parameterType="Long" resultMap="RtEnlistmentReserveApprovalResult">
+    <select id="selectRtEnlistmentReserveApprovalById" parameterType="Long"
+            resultMap="RtEnlistmentReserveApprovalResult">
         <include refid="selectRtEnlistmentReserveApprovalVo"/>
         where id = #{id}
     </select>
@@ -61,7 +81,8 @@
         </where>
     </select>
 
-    <insert id="insertRtEnlistmentReserveApproval" parameterType="EnlistmentReserveApproval" useGeneratedKeys="true" keyProperty="id">
+    <insert id="insertRtEnlistmentReserveApproval" parameterType="EnlistmentReserveApproval" useGeneratedKeys="true"
+            keyProperty="id">
         insert into rt_enlistment_reserve_approval
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="applyId != null">apply_id,</if>
@@ -95,7 +116,9 @@
         update rt_enlistment_reserve_approval
         <trim prefix="SET" suffixOverrides=",">
             <if test="applyId != null">apply_id = #{applyId},</if>
-            <if test="processInstanceId != null and processInstanceId != ''">process_instance_id = #{processInstanceId},</if>
+            <if test="processInstanceId != null and processInstanceId != ''">process_instance_id =
+                #{processInstanceId},
+            </if>
             <if test="taskId != null and taskId != ''">task_id = #{taskId},</if>
             <if test="nodeName != null and nodeName != ''">node_name = #{nodeName},</if>
             <if test="approverId != null">approver_id = #{approverId},</if>
@@ -110,7 +133,9 @@
     </update>
 
     <delete id="deleteRtEnlistmentReserveApprovalById" parameterType="Long">
-        delete from rt_enlistment_reserve_approval where id = #{id}
+        delete
+        from rt_enlistment_reserve_approval
+        where id = #{id}
     </delete>
 
     <delete id="deleteRtEnlistmentReserveApprovalByIds" parameterType="String">