Forráskód Böngészése

1、需要分配-调整床位的学生,没有住宿的班级不返回

dzx 1 éve
szülő
commit
9a5fe2f419

+ 1 - 1
src/main/java/com/xjrsoft/module/room/dto/AdjustClassPageDto.java

@@ -19,7 +19,7 @@ public class AdjustClassPageDto extends PageInput {
     @ApiModelProperty("年级id")
     public Long gradeId;
 
-    @ApiModelProperty("级id")
+    @ApiModelProperty("级id")
     public Long classId;
 
     @ApiModelProperty("入住性别")

+ 8 - 3
src/main/java/com/xjrsoft/module/room/service/impl/RoomBedServiceImpl.java

@@ -246,17 +246,22 @@ public class RoomBedServiceImpl extends MPJBaseServiceImpl<RoomBedMapper, RoomBe
             .eq(ObjectUtil.isNotNull(dto.getClassId()), BaseClass::getId, dto.getClassId())
             .eq(ObjectUtil.isNotNull(dto.getGradeId()), BaseClass::getGradeId, dto.getGradeId())
         );
-        List<AdjustBedClassPageVo> result = BeanUtil.copyToList(classList, AdjustBedClassPageVo.class);
+        List<AdjustBedClassPageVo> result = new ArrayList<>();
         List<AdjustBedClassStudentPageVo> allStudent = roomBedMapper.getClassStudetBed(dto);
-        for (AdjustBedClassPageVo adjustBedClassPageVo : result) {
+        for (BaseClass classOne : classList) {
             List<AdjustBedClassStudentPageVo> studentList = new ArrayList<>();
             for (AdjustBedClassStudentPageVo adjustBedClassStudentPageVo : allStudent) {
-                if(!adjustBedClassPageVo.getId().equals(adjustBedClassStudentPageVo.getClassId())){
+                if(!classOne.getId().toString().equals(adjustBedClassStudentPageVo.getClassId())){
                     continue;
                 }
                 studentList.add(adjustBedClassStudentPageVo);
             }
+            if(studentList.isEmpty()){
+                continue;
+            }
+            AdjustBedClassPageVo adjustBedClassPageVo = BeanUtil.toBean(classOne, AdjustBedClassPageVo.class);
             adjustBedClassPageVo.setStudentList(studentList);
+            result.add(adjustBedClassPageVo);
         }
         
         return result;