增加时间检查

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

@@ -120,7 +120,4 @@ public class BaseStudentInfoPageVo {
 
     @ApiModelProperty("学生类别")
     private String studentForm;
-
-    @ApiModelProperty("所属楼栋寝室床位")
-    private String roomInfo;
 }

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

@@ -34,7 +34,6 @@
             MAX(CASE WHEN t10.feeitemcode LIKE '999010604%' THEN t10.jfzt ELSE NULL END) AS jxf,
             MAX(CASE WHEN t10.feeitemcode = 103042766003001 AND LEFT(t10.beltcode, 4) = DATE_FORMAT(CURRENT_DATE, '%Y') THEN t10.jfzt ELSE NULL END) AS ssf,
             MAX(CASE WHEN t10.feeitemcode LIKE '999010603%' THEN t10.jfzt ELSE NULL END) AS jcf,
-            CONCAT(t17.name, ' ', t16.room_name, ' ', t15.bed_number) AS room_info
         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
@@ -48,9 +47,6 @@
         LEFT JOIN xjr_dictionary_detail t13 ON t13.code = t3.roll_modality
         LEFT JOIN pb_v_xssfdetail t9 ON t9.personalid = t1.student_id
         LEFT JOIN pb_v_xsxxsfytb t10 ON t10.Studentcode = t9.personalid
-        left join room_bed t15 on t15.student_user_id = t6.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
         WHERE t2.delete_mark = 0
         AND t1.delete_mark = 0
         AND t3.archives_status = 'FB2901'
@@ -109,8 +105,7 @@
                 t12.name AS student_form,
                MAX(CASE WHEN t14.feeitemcode LIKE '999010604%' THEN t14.jfzt ELSE NULL END) AS jxf,
                MAX(CASE WHEN t14.feeitemcode = 103042766003001 AND LEFT(t14.beltcode, 4) = DATE_FORMAT(CURRENT_DATE, '%Y') THEN t14.jfzt ELSE NULL END) AS ssf,
-               MAX(CASE WHEN t14.feeitemcode LIKE '999010603%' THEN t14.jfzt ELSE NULL END) AS jcf,
-               CONCAT(t17.name, ' ', t16.room_name, ' ', t15.bed_number) AS room_info
+               MAX(CASE WHEN t14.feeitemcode LIKE '999010603%' THEN t14.jfzt ELSE NULL END) AS jcf
         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
@@ -125,9 +120,6 @@
                  LEFT JOIN xjr_dictionary_detail t12 ON t12.code = t3.student_type
                  LEFT JOIN pb_v_xssfdetail t13 ON t13.personalid = t1.student_id
                  LEFT JOIN pb_v_xsxxsfytb t14 ON t14.Studentcode = t13.personalid
-                 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
         WHERE t2.id = #{id}
         GROUP BY t2.id, t2.name, t2.mobile, t2.gender, t11.name, t1.student_id, t5.name, t5.mobile, t4.name,
                  (SELECT mobile FROM base_student_family_member WHERE delete_mark = 0 AND user_id = t2.id AND is_guardian = 1),