床位调整增加缴费状态

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

@@ -411,12 +411,26 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
         );
         List<AdjustBedClassPageVo> result = new ArrayList<>();
         List<AdjustBedClassStudentPageVo> allStudent = roomBedMapper.getClassStudetBed(dto);
+
+        //查询缴费状态
+        DistributeRoomBedDto distributeRoomBedDto = new DistributeRoomBedDto();
+        List<Long> classIds = new ArrayList<>();
+        for (BaseClass baseClass : classList) {
+            classIds.add(baseClass.getId());
+        }
+        distributeRoomBedDto.setClassIds(classIds);
+        List<StudentPayStatusVo> studentPayStatusVoList = roomBedMapper.getStudentPayStatus(distributeRoomBedDto);
+        Map<Long, Integer> payStatusMap = new HashMap<>();
+        for (StudentPayStatusVo statusVo : studentPayStatusVoList) {
+            payStatusMap.put(statusVo.getId(), statusVo.getPayStatus());
+        }
         for (BaseClass classOne : classList) {
             List<AdjustBedClassStudentPageVo> studentList = new ArrayList<>();
             for (AdjustBedClassStudentPageVo adjustBedClassStudentPageVo : allStudent) {
                 if(!classOne.getId().toString().equals(adjustBedClassStudentPageVo.getClassId())){
                     continue;
                 }
+                adjustBedClassStudentPageVo.setPayStatus(payStatusMap.get(Long.valueOf(adjustBedClassStudentPageVo.getUserId())));
                 studentList.add(adjustBedClassStudentPageVo);
             }
             if(studentList.isEmpty()){

src/main/java/com/xjrsoft/module/room/vo/AdjustBedClassStudentPageVo.java

@@ -48,4 +48,8 @@ public class AdjustBedClassStudentPageVo {
     @ContentStyle(dataFormat = 49)
     @ApiModelProperty("床位")
     private String bedNumber;
+
+    @ContentStyle(dataFormat = 49)
+    @ApiModelProperty("缴费状态（1:已缴费 0:未缴费）")
+    private Integer payStatus;
 }