寝室床位调整bug修复

src/main/java/com/xjrsoft/module/student/entity/BaseStudentDevelopment.java

@@ -102,7 +102,7 @@ public class BaseStudentDevelopment implements Serializable {
     /**
     * 是否灵活就业(1:是 0:否)
     */
-    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    @ApiModelProperty("工作内容")
     private Integer workContent;
     /**
     * 是否校企合作单位(1:是 0:否)

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

@@ -57,7 +57,7 @@ public class BaseStudentDevelopmentPageVo {
     /**
     * 是否灵活就业(1:是 0:否)
     */
-    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    @ApiModelProperty("工作内容")
     private Integer workContent;
     /**
     * 是否校企合作单位(1:是 0:否)

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

@@ -47,7 +47,7 @@ public class BaseStudentDevelopmentVo {
     /**
     * 是否灵活就业(1:是 0:否)
     */
-    @ApiModelProperty("是否灵活就业(1:是 0:否)")
+    @ApiModelProperty("工作内容")
     private Integer workContent;
     /**
     * 是否校企合作单位(1:是 0:否)

src/main/resources/mapper/room/RoomBedMapper.xml

@@ -286,15 +286,15 @@
 
     <select id="getClassStudetBed" parameterType="com.xjrsoft.module.room.dto.AdjustClassPageDto" resultType="com.xjrsoft.module.room.vo.AdjustBedClassStudentPageVo">
         SELECT t1.user_id,t4.id AS class_id, t4.name AS class_name,t2.name AS student_name,
-        REPLACE(REPLACE(t2.gender,'SB10001','男'),'SB10002','女') AS gender_cn,t7.name AS build_name,t6.room_name,t5.bed_number,
-        (t8.factrecarmny >= t8.factar) AS pay_status FROM base_student t1
+        REPLACE(REPLACE(t2.gender,'SB10001','男'),'SB10002','女') AS gender_cn,t7.name AS build_name,t6.room_name,t5.bed_number
+        ,(SELECT (SUM(factrecarmny) >= SUM(factar)) FROM pb_v_xsxxsfytb WHERE Studentcode = t2.credential_number) AS pay_status
+        FROM base_student t1
         LEFT JOIN xjr_user t2 ON t1.user_id = t2.id
         LEFT JOIN base_student_school_roll t3 ON t1.user_id = t3.user_id
         LEFT JOIN base_class t4 ON t3.class_id = t4.id
         LEFT JOIN room_bed t5 ON t5.student_user_id = t1.user_id
         LEFT JOIN room t6 ON t5.room_id = t6.id
         LEFT JOIN base_office_build t7 ON t6.office_build_id = t7.id
-        INNER JOIN pb_v_xsxxsfytb t8 ON t2.credential_number = t8.Studentcode
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         AND t3.stduy_status = 'FB3002'
         AND t3.archives_status = 'FB2901'