diff --git a/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java b/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java
index 6a91a60..5c58c67 100644
--- a/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java
+++ b/srs-routine/src/main/java/com/srs/routine/domain/SysDisBasic.java
@@ -2,6 +2,7 @@ package com.srs.routine.domain;
 
 import com.srs.common.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.*;
+import com.srs.comprehensive.domain.SrsStudent;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -393,6 +394,54 @@ private static final long serialVersionUID=1L;
     @Excel(name = "保留字段2")
     private String testTest;
 
+    /**
+     * 招就处电子签名
+     */
+    @ApiModelProperty("招就处电子签名")
+    @TableField("zs_qmd")
+    @Excel(name = "招就处电子签名")
+    private String zsQmd;
+
+    /**
+     * 辅导员电子签名
+     */
+    @ApiModelProperty("辅导员电子签名")
+    @TableField("fd_qmd")
+    @Excel(name = "辅导员电子签名")
+    private String fdQmd;
+
+    /**
+     * 学务电子签名
+     */
+    @ApiModelProperty("学务电子签名")
+    @TableField("xw_qmd")
+    @Excel(name = "学务电子签名")
+    private String xwQmd;
+
+    /**
+     * 二级学院电子签名
+     */
+    @ApiModelProperty("二级学院电子签名")
+    @TableField("rj_qmd")
+    @Excel(name = "二级学院电子签名")
+    private String rjQmd;
+
+    /**
+     * 学籍管理电子签名
+     */
+    @ApiModelProperty("学籍管理电子签名")
+    @TableField("xj_qmd")
+    @Excel(name = "学籍管理电子签名")
+    private String xjQmd;
+
+    /**
+     * 教务处电子签名
+     */
+    @ApiModelProperty("教务处电子签名")
+    @TableField("jwc_qmd")
+    @Excel(name = "教务处电子签名")
+    private String jwcQmd;
+
     /**
      * 退伍复学-填报材料
      */
@@ -400,4 +449,11 @@ private static final long serialVersionUID=1L;
     @Excel(name = "退伍复学-填报材料")
     private List<SysDisMate> MaList;
 
+    /**
+     * 退伍复学-填报材料
+     */
+    @ApiModelProperty(value = "退伍复学-填报材料", hidden = true)
+    @Excel(name = "退伍复学-填报材料")
+    private List<SrsStudent> StuList;
+
 }
diff --git a/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml b/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml
index 66d1617..82e079c 100644
--- a/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml
+++ b/srs-routine/src/main/resources/mapper/routine/SysDisBasicMapper.xml
@@ -51,11 +51,107 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="studentId"    column="student_id"    />
         <result property="testData"    column="test_data"    />
         <result property="testTest"    column="test_test"    />
+        <result property="zsQmd"    column="zs_qmd"    />
+        <result property="fdQmd"    column="fd_qmd"    />
+        <result property="xwQmd"    column="xw_qmd"    />
+        <result property="rjQmd"    column="rj_qmd"    />
+        <result property="xjQmd"    column="xj_qmd"    />
+        <result property="jwcQmd"    column="jwc_qmd"    />
         <!--填报退伍材料-->
         <collection property="MaList" column="{stId = st_id}" javaType="java.util.ArrayList" select="selectMateById"/>
-
+        <!--学生表-->
+        <collection property="StuList" column="{stuNo = st_id}" javaType="java.util.ArrayList" select="selectSrsStudentByStuNo"/>
     </resultMap>
 
+<!--    学生表关联-->
+    <resultMap type="SrsStudent" id="SrsStudentResult">
+        <result property="stuId" column="stu_id"/>
+        <result property="name" column="name"/>
+        <result property="stuNo" column="stu_no"/>
+        <result property="gender" column="gender"/>
+        <result property="birthday" column="birthday"/>
+        <result property="idCard" column="id_card"/>
+        <result property="deptId" column="dept_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="classId" column="class_id"/>
+        <result property="phone" column="phone"/>
+        <result property="address" column="address"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="xhk" column="xhk"/>
+        <result property="bankAddr" column="bank_addr"/>
+        <result property="teacherId" column="teacher_id"/>
+        <result property="cphName" column="cphName"/>
+        <result property="gradeName" column="grade_name"/>
+        <result property="status2" column="status2"/>
+        <result property="deptName" column="dept_name" />
+        <association property="dept" column="dept_id" javaType="SysDept" resultMap="deptResult"/>
+        <association property="srsMajors" column="major_id" javaType="srsMajors" resultMap="SrsMajorsResult"/>
+        <association property="srsClass" column="class_id" javaType="srsClass" resultMap="SrsClassResult"/>
+        <association property="cphTeacher" column="teacher_id" javaType="cphTeacher" resultMap="CphTeacherResult"/>
+        <association property="cphStuExtraInfo" column="stu_no" javaType="cphStuExtraInfo"
+                     resultMap="CphStuExtraInfoResult"/>
+    </resultMap>
+
+<!--    学生表关联表-->
+    <resultMap id="CphStuExtraInfoResult" type="CphStuExtraInfo">
+        <result property="stuNo" column="stu_no"/>
+        <result property="mz" column="mz"/>
+        <result property="zzmm" column="zzmm"/>
+        <result property="jg" column="jg"/>
+        <result property="xx" column="xx"/>
+    </resultMap>
+    <resultMap id="CphTeacherResult" type="CphTeacher">
+        <result property="teacherId" column="teacher_id"/>
+        <result property="name" column="name"/>
+    </resultMap>
+    <resultMap type="SrsGrade" id="SrsGradeResult">
+        <result property="gradeId" column="grade_id"/>
+        <result property="gradeName" column="grade_name"/>
+    </resultMap>
+    <resultMap type="SrsClass" id="SrsClassResult">
+        <result property="classId" column="class_id"/>
+        <result property="majorId" column="major_id"/>
+        <result property="className" column="class_name"/>
+    </resultMap>
+    <resultMap type="SrsMajors" id="SrsMajorsResult">
+        <result property="majorId" column="major_id"/>
+        <result property="majorName" column="major_name"/>
+        <result property="collegeId" column="college_id"/>
+        <result property="majorDescription" column="major_description"/>
+    </resultMap>
+    <resultMap id="deptResult" type="SysDept">
+        <id property="deptId" column="dept_id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="deptName" column="dept_name"/>
+        <result property="ancestors" column="ancestors"/>
+        <result property="orderNum" column="order_num"/>
+        <result property="leader" column="leader"/>
+        <result property="status" column="dept_status"/>
+    </resultMap>
+
+    <resultMap id="studentName" type="CascaderEntity">
+        <id property="value" column="stu_id"/>
+        <result property="label" column="name"/>
+    </resultMap>
+
+    <!--    学生表通过学号关联-->
+    <select id="selectSrsStudentByStuNo" resultMap="SrsStudentResult">
+        select *
+        from srs_student
+        <where>
+            <if test="stuNo != null and stuNo != ''">
+                and stu_no = #{stuNo}
+            </if>
+        </where>
+    </select>
+
+
+
     <!--    联表 材料上传-->
     <resultMap type="SysDisMate" id="SysDisMateResult">
         <result property="id"    column="id"    />
@@ -89,6 +185,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+
+
     <!--查询是否插入过记录-->
     <select id="selectSysDisBasicByStId" parameterType="String" resultMap="SysDisBasicResult">
         <include refid="selectSysDisBasicVo"/>
@@ -128,9 +227,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
-
     <sql id="selectSysDisBasicVo">
-        select id, fx_id, fx_time, st_id, st_name, fd_name, sex, nations, fd_qm, xw_qm, er_qm, xj_qm, jw_qm, st_class, majors, grade, college, reasons, fd_idea, two_idea, xw_idea, xj_idea, jw_idea, zs_idea, zs_status, times, fd_status, xw_status, two_status, xjgl_status, jw_status, rw_time, zs_time, fd_time, xw_time, two_time, xj_time, jw_time, datab, dataa, conversion, process_id, deploy_id, student_id, test_data, test_test from sys_dis_basic
+        select id, fx_id, fx_time, st_id, st_name, fd_name, sex, nations, fd_qm, xw_qm, er_qm, xj_qm, jw_qm, st_class, majors, grade, college, reasons, fd_idea, two_idea, xw_idea, xj_idea, jw_idea, zs_idea, zs_status, times, fd_status, xw_status, two_status, xjgl_status, jw_status, rw_time, zs_time, fd_time, xw_time, two_time, xj_time, jw_time, datab, dataa, conversion, process_id, deploy_id, student_id, test_data, test_test, zs_qmd, fd_qmd, xw_qmd, rj_qmd, xj_qmd, jwc_qmd from sys_dis_basic
     </sql>
 
     <select id="selectSysDisBasicList" parameterType="SysDisBasic" resultMap="SysDisBasicResult">
@@ -181,6 +279,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studentId != null "> and student_id = #{studentId}</if>
             <if test="testData != null  and testData != ''"> and test_data = #{testData}</if>
             <if test="testTest != null  and testTest != ''"> and test_test = #{testTest}</if>
+            <if test="zsQmd != null  and zsQmd != ''"> and zs_qmd = #{zsQmd}</if>
+            <if test="fdQmd != null  and fdQmd != ''"> and fd_qmd = #{fdQmd}</if>
+            <if test="xwQmd != null  and xwQmd != ''"> and xw_qmd = #{xwQmd}</if>
+            <if test="rjQmd != null  and rjQmd != ''"> and rj_qmd = #{rjQmd}</if>
+            <if test="xjQmd != null  and xjQmd != ''"> and xj_qmd = #{xjQmd}</if>
+            <if test="jwcQmd != null  and jwcQmd != ''"> and jwc_qmd = #{jwcQmd}</if>
         </where>
     </select>
     
@@ -237,6 +341,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studentId != null">student_id,</if>
             <if test="testData != null">test_data,</if>
             <if test="testTest != null">test_test,</if>
+            <if test="zsQmd != null">zs_qmd,</if>
+            <if test="fdQmd != null">fd_qmd,</if>
+            <if test="xwQmd != null">xw_qmd,</if>
+            <if test="rjQmd != null">rj_qmd,</if>
+            <if test="xjQmd != null">xj_qmd,</if>
+            <if test="jwcQmd != null">jwc_qmd,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fxId != null">#{fxId},</if>
@@ -284,6 +394,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studentId != null">#{studentId},</if>
             <if test="testData != null">#{testData},</if>
             <if test="testTest != null">#{testTest},</if>
+            <if test="zsQmd != null">#{zsQmd},</if>
+            <if test="fdQmd != null">#{fdQmd},</if>
+            <if test="xwQmd != null">#{xwQmd},</if>
+            <if test="rjQmd != null">#{rjQmd},</if>
+            <if test="xjQmd != null">#{xjQmd},</if>
+            <if test="jwcQmd != null">#{jwcQmd},</if>
          </trim>
     </insert>
 
@@ -335,6 +451,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="studentId != null">student_id = #{studentId},</if>
             <if test="testData != null">test_data = #{testData},</if>
             <if test="testTest != null">test_test = #{testTest},</if>
+            <if test="zsQmd != null">zs_qmd = #{zsQmd},</if>
+            <if test="fdQmd != null">fd_qmd = #{fdQmd},</if>
+            <if test="xwQmd != null">xw_qmd = #{xwQmd},</if>
+            <if test="rjQmd != null">rj_qmd = #{rjQmd},</if>
+            <if test="xjQmd != null">xj_qmd = #{xjQmd},</if>
+            <if test="jwcQmd != null">jwc_qmd = #{jwcQmd},</if>
         </trim>
         where id = #{id}
     </update>