Merge remote-tracking branch 'origin/main'

srs-routine/src/main/resources/mapper/routine/RtEnlistmentReserveMapper.xml

@@ -28,6 +28,7 @@
         <result property="createTime" column="create_time"/>
         <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}"
@@ -122,7 +123,8 @@
                approval_no,
                create_time,
                update_time,
-               affix_id
+               affix_id,
+               deploy_id
         from rt_enlistment_reserve
     </sql>
 
@@ -156,6 +158,7 @@
             <if test="reserveEndDate != null ">and reserve_end_date = #{reserveEndDate}</if>
             <if test="approvalNo != null  and approvalNo != ''">and approval_no = #{approvalNo}</if>
             <if test="affixId != null  and affixId != ''">and affix_id = #{affixId}</if>
+            <if test="deployId != null  and deployId != ''"> and deploy_id = #{deployId}</if>
         </where>
     </select>
 
@@ -206,6 +209,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="affixId != null">affix_id,</if>
+            <if test="deployId != null">deploy_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="applyNo != null and applyNo != ''">#{applyNo},</if>
@@ -230,6 +234,7 @@
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="affixId != null">#{affixId},</if>
+            <if test="deployId != null">#{deployId},</if>
         </trim>
     </insert>
 
@@ -258,6 +263,7 @@
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="affixId != null">affix_id = #{affixId},</if>
+            <if test="deployId != null">deploy_id = #{deployId},</if>
         </trim>
         where id = #{id}
     </update>