Merge remote-tracking branch 'origin/main'

srs-routine/src/main/java/com/srs/routine/domain/RtEnlistmentReserveAttach.java

@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import com.srs.common.core.domain.BaseEntity;
 
+import java.util.List;
+
 
 /**
  * 保留学籍申请附件（入伍通知书等）对象 rt_enlistment_reserve_attach
@@ -95,5 +97,10 @@ public class RtEnlistmentReserveAttach extends BaseEntity {
     @Excel(name = "学号")
     private String studentNo;
 
-
+    /**
+     * 入伍保留学籍申请表
+     */
+    @ApiModelProperty(value = "入伍保留学籍申请表", hidden = true)
+    @Excel(name = "入伍保留学籍申请表")
+    private List<RtEnlistmentReserve> rtEnlistmentReserves;
 }

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

@@ -15,8 +15,56 @@
         <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字段）-->
+        <collection property="rtEnlistmentReserves"
+                    column="{studentName = student_name, studentNo = student_no, id = apply_id}"
+                    javaType="java.util.ArrayList" select="selectRtEnlistmentReserveByStuName"/>
     </resultMap>
 
+    <resultMap type="RtEnlistmentReserve" id="RtEnlistmentReserveResult">
+        <result property="id" column="id"/>
+        <result property="applyNo" column="apply_no"/>
+        <result property="studentId" column="student_id"/>
+        <result property="teacherName" column="teacher_name"/>
+        <result property="studentName" column="student_name"/>
+        <result property="gender" column="gender"/>
+        <result property="nation" column="nation"/>
+        <result property="grade" column="grade"/>
+        <result property="studentNo" column="student_no"/>
+        <result property="className" column="class_name"/>
+        <result property="major" column="major"/>
+        <result property="familyAddress" column="family_address"/>
+        <result property="parentPhone" column="parent_phone"/>
+        <result property="applyReason" column="apply_reason"/>
+        <result property="applyStatus" column="apply_status"/>
+        <result property="processInstanceId" column="process_instance_id"/>
+        <result property="reserveNo" column="reserve_no"/>
+        <result property="reserveStartDate" column="reserve_start_date"/>
+        <result property="reserveEndDate" column="reserve_end_date"/>
+        <result property="approvalNo" column="approval_no"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="affixId" column="affix_id"/>
+        <result property="deployId"    column="deploy_id"    />
+    </resultMap>
+
+    <!--  入伍保留申请表 -->
+    <select id="selectRtEnlistmentReserveByStuName" resultMap="RtEnlistmentReserveResult">
+        select *
+        from rt_enlistment_reserve
+        <where>
+            <if test="id != null and id != ''">
+                and id = #{id}
+            </if>
+            <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,