学生增加实习状态

src/main/java/com/xjrsoft/module/student/vo/BaseStudentInfoDetailVo.java

@@ -129,4 +129,10 @@ public class BaseStudentInfoDetailVo {
 
     @ApiModelProperty("身份证号")
     private String credentialNumber;
+
+    @ApiModelProperty("实习状态-中文")
+    private String internshipStateCn;
+
+    @ApiModelProperty("实习状态")
+    private String internshipState;
 }

src/main/java/com/xjrsoft/module/student/vo/BaseStudentSchoolRollVo.java

@@ -151,5 +151,8 @@ public class BaseStudentSchoolRollVo {
     @ApiModelProperty("寝室号")
     private String roomName;
 
+    @ApiModelProperty("实习状态")
+    private String internshipState;
+
 
 }

src/main/resources/mapper/student/BaseStudentSchoolRollMapper.xml

@@ -107,7 +107,8 @@
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010604%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jxf,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode = 103042766003001 AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS ssf,
                REPLACE(IFNULL((SELECT jfzt FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number AND feeitemcode LIKE '999010603%' AND jfzt = '未缴费' LIMIT 1),'已缴费'),'未缴费','欠费') AS jcf,
-               CONCAT(t17.name, ' ', t16.room_name, ' ', t15.bed_number) AS bed_info
+               CONCAT(t17.name, ' ', t16.room_name, ' ', t15.bed_number) AS bed_info,
+               t18.name as internship_state_cn,t3.internship_state
         FROM base_student t1
                  INNER JOIN xjr_user t2 ON t1.user_id = t2.id
                  INNER JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
@@ -123,6 +124,7 @@
                  left join room_bed t15 on t15.student_user_id = t1.user_id
                  left join room t16 on t16.id = t15.room_id
                  left join base_office_build t17 on t17.id = t16.office_build_id
+                 LEFT JOIN xjr_dictionary_detail t18 ON t3.internship_state = t18.code
         WHERE t2.id = #{dto.id}
     </select>
     <update id="updateInfoByUserId" parameterType="com.xjrsoft.module.student.dto.UpdateBaseStudentInfoDto">
@@ -130,6 +132,7 @@
         <if test="dto.rollModality != null and dto.rollModality != ''">,roll_modality = #{dto.rollModality},learn_status = #{dto.rollModality} </if>
         <if test="dto.archivesStatus != null and dto.archivesStatus != ''">,archives_status = #{dto.archivesStatus} </if>
         <if test="dto.stduyStatus != null and dto.stduyStatus != ''">,stduy_status = #{dto.stduyStatus} </if>
+        <if test="dto.internshipState != null and dto.internshipState != ''">,internship_state = #{dto.internshipState} </if>
         where user_id = #{id}
     </update>