床位调整班级列表增加缴费状态

src/main/java/com/xjrsoft/module/room/dto/AdjustClassPageDto.java

@@ -25,10 +25,13 @@ public class AdjustClassPageDto extends PageInput {
     @ApiModelProperty("入住性别")
     public String gender;
 
-    @ApiModelProperty("是否安排寝室（1：是，0，否）")
+    @ApiModelProperty("是否安排寝室（1：是，0：否）")
     public Integer isDistribute;
 
     @ApiModelProperty("姓名")
     public String studentName;
 
+    @ApiModelProperty("缴费状态（1：已缴费，0：未交费）")
+    public Integer payStatus;
+
 }

src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -447,26 +447,26 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             distributeRoomBedDto.setClassIds(classIds);
         }
 
-        List<StudentPayStatusVo> studentPayStatusVoList = roomBedMapper.getStudentPayStatus(distributeRoomBedDto);
-        Map<Long, Integer> payStatusMap = new HashMap<>();
-        for (StudentPayStatusVo statusVo : studentPayStatusVoList) {
-            Integer payStatus = 0;
-            if(statusVo.getPayStatus() != null){
-                payStatus = statusVo.getPayStatus();
-            }
-            payStatusMap.put(statusVo.getId(), payStatus);
-        }
+//        List<StudentPayStatusVo> studentPayStatusVoList = roomBedMapper.getStudentPayStatus(distributeRoomBedDto);
+//        Map<Long, Integer> payStatusMap = new HashMap<>();
+//        for (StudentPayStatusVo statusVo : studentPayStatusVoList) {
+//            Integer payStatus = 0;
+//            if(statusVo.getPayStatus() != null){
+//                payStatus = statusVo.getPayStatus();
+//            }
+//            payStatusMap.put(statusVo.getId(), payStatus);
+//        }
         for (AdjustBedClassPageVo classOne : classList) {
             List<AdjustBedClassStudentPageVo> studentList = new ArrayList<>();
             for (AdjustBedClassStudentPageVo adjustBedClassStudentPageVo : allStudent) {
                 if(!classOne.getId().toString().equals(adjustBedClassStudentPageVo.getClassId())){
                     continue;
                 }
-                Integer payStatus = payStatusMap.get(Long.valueOf(adjustBedClassStudentPageVo.getUserId()));
-                if(payStatus == null){
-                    payStatus = 0;
-                }
-                adjustBedClassStudentPageVo.setPayStatus(payStatus);
+//                Integer payStatus = payStatusMap.get(Long.valueOf(adjustBedClassStudentPageVo.getUserId()));
+//                if(payStatus == null){
+//                    payStatus = 0;
+//                }
+//                adjustBedClassStudentPageVo.setPayStatus(payStatus);
                 studentList.add(adjustBedClassStudentPageVo);
             }
             if(studentList.isEmpty()){

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

@@ -285,15 +285,18 @@
     </select>
 
     <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 FROM base_student t1
+        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
         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.stduy_status = 'FB3002'
         AND t3.archives_status = 'FB2901'
         <if test="dto.gradeId != null">
             and t4.grade_id = #{dto.gradeId}
@@ -315,6 +318,9 @@
         <if test="dto.studentName != null and dto.studentName != ''">
             and t2.name like concat('%', #{dto.studentName}, '%')
         </if>
+        <if test="dto.payStatus != null">
+            and (t8.factrecarmny >= t8.factar) = #{dto.payStatus}
+        </if>
     </select>
 
     <select id="getBedStudentInfo" parameterType="com.xjrsoft.module.room.dto.AdjustBedPageDto" resultType="com.xjrsoft.module.room.vo.AdjustBedStudentPageVo">