退伍复学表单

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

@@ -48,8 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="conversion"    column="conversion"    />
         <result property="processId"    column="process_id"    />
         <result property="deployId"    column="deploy_id"    />
+        <result property="studentId"    column="student_id"    />
+        <result property="testData"    column="test_data"    />
+        <result property="testTest"    column="test_test"    />
         <!--填报退伍材料-->
         <collection property="MaList" column="{stId = st_id}" javaType="java.util.ArrayList" select="selectMateById"/>
+
     </resultMap>
 
     <!--    联表 材料上传-->
@@ -81,20 +85,49 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <!--查询是否插入过记录-->
+    <select id="selectSysDisBasicByStId" parameterType="String" resultMap="SysDisBasicResult">
+        <include refid="selectSysDisBasicVo"/>
+        <where>
+            <if test="stId != null and stId != ''">
+                and st_id = #{stId}
+            </if>
 
-    <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 from sys_dis_basic
-    </sql>
-
-    <select id="getCounselorInfo" resultType="com.srs.common.doman.vo.TeacherVo">
-        SELECT d.user_id userId, d.dept_id deptId, d.user_name userName, d.nick_name nickName
-        FROM srs_student a
-        LEFT JOIN srs_class b ON a.class_id = b.class_id
-        LEFT JOIN cph_teacher c ON b.teacher_id = c.teacher_id
-        LEFT JOIN sys_user d ON c.employee_id = d.user_name
-        WHERE a.stu_id = #{stId}
+        </where>
     </select>
 
+    <!--    根据姓名查询信息-->
+    <select id="selectSysDisBasicByStName" parameterType="String" resultMap="SysDisBasicResult">
+        <include refid="selectSysDisBasicVo"/>
+        <where>
+            <if test="stName != null and stName != ''">
+                and st_name = #{stName}
+            </if>
+
+        </where>
+    </select>
+
+    <!--  根据流程编号查询申请记录  -->
+    <select id="selectSysDisBasicByProcessInstanceId" parameterType="String"
+            resultMap="SysDisBasicResult">
+        <include refid="selectSysDisBasicVo"/>
+        where process_id = #{processId}
+    </select>
+
+    <!-- 获取审批用户信息 -->
+    <select id="getShenDataInfo" resultType="com.srs.common.doman.vo.TeacherVo">
+        SELECT a.user_id userId, a.dept_id deptId, a.nick_name userNick, a.user_name userName
+        FROM sys_user a
+        LEFT JOIN sys_user_role b ON a.user_id = b.user_id
+        LEFT JOIN sys_role c ON b.role_id = c.role_id
+        WHERE c.role_name = #{roleName}
+    </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
+    </sql>
 
     <select id="selectSysDisBasicList" parameterType="SysDisBasic" resultMap="SysDisBasicResult">
         <include refid="selectSysDisBasicVo"/>
@@ -141,6 +174,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null  and conversion != ''"> and conversion = #{conversion}</if>
             <if test="processId != null  and processId != ''"> and process_id = #{processId}</if>
             <if test="deployId != null  and deployId != ''"> and deploy_id = #{deployId}</if>
+            <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>
         </where>
     </select>
     
@@ -148,28 +184,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectSysDisBasicVo"/>
         where id = #{id}
     </select>
-
-    <!--查询是否插入过记录-->
-    <select id="selectSysDisBasicByStId" parameterType="String" resultMap="SysDisBasicResult">
-        <include refid="selectSysDisBasicVo"/>
-        <where>
-            <if test="stId != null and stId != ''">
-                and st_id = #{stId}
-            </if>
-
-        </where>
-    </select>
-
-
-    <!-- 获取审批用户信息 -->
-    <select id="getShenDataInfo" resultType="com.srs.common.doman.vo.TeacherVo">
-        SELECT a.user_id userId, a.dept_id deptId, a.nick_name userNick, a.user_name userName
-        FROM sys_user a
-        LEFT JOIN sys_user_role b ON a.user_id = b.user_id
-        LEFT JOIN sys_role c ON b.role_id = c.role_id
-        WHERE c.role_name = #{roleName}
-    </select>
-
         
     <insert id="insertSysDisBasic" parameterType="SysDisBasic" useGeneratedKeys="true" keyProperty="id">
         insert into sys_dis_basic
@@ -216,6 +230,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null">conversion,</if>
             <if test="processId != null">process_id,</if>
             <if test="deployId != null">deploy_id,</if>
+            <if test="studentId != null">student_id,</if>
+            <if test="testData != null">test_data,</if>
+            <if test="testTest != null">test_test,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="fxId != null">#{fxId},</if>
@@ -260,6 +277,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null">#{conversion},</if>
             <if test="processId != null">#{processId},</if>
             <if test="deployId != null">#{deployId},</if>
+            <if test="studentId != null">#{studentId},</if>
+            <if test="testData != null">#{testData},</if>
+            <if test="testTest != null">#{testTest},</if>
          </trim>
     </insert>
 
@@ -308,6 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conversion != null">conversion = #{conversion},</if>
             <if test="processId != null">process_id = #{processId},</if>
             <if test="deployId != null">deploy_id = #{deployId},</if>
+            <if test="studentId != null">student_id = #{studentId},</if>
+            <if test="testData != null">test_data = #{testData},</if>
+            <if test="testTest != null">test_test = #{testTest},</if>
         </trim>
         where id = #{id}
     </update>
@@ -322,4 +345,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>