|
@@ -341,8 +341,8 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
|
|
|
List<areaStatusVo> areaList = new ArrayList<>();
|
|
|
stringListMap.forEach((key, value) -> {
|
|
|
areaStatusVo areaStatusVo = new areaStatusVo();
|
|
|
- List willDone = value.stream().filter(item -> item.getRoomStatus().equals("未施工")).collect(Collectors.toList());
|
|
|
- List notstart = value.stream().filter(item -> item.getRoomStatus().equals("施工中")).collect(Collectors.toList());
|
|
|
+ List notstart = value.stream().filter(item -> item.getRoomStatus().equals("未施工")).collect(Collectors.toList());
|
|
|
+ List willDone = value.stream().filter(item -> item.getRoomStatus().equals("施工中")).collect(Collectors.toList());
|
|
|
List done = value.stream().filter(item -> item.getRoomStatus().equals("竣工")).collect(Collectors.toList());
|
|
|
areaStatusVo.setAreaId(key);
|
|
|
areaStatusVo.setAreaName(value.get(0).getName());
|