|
|
@@ -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;
|