소스 검색

修改换房页面接口

liu 1 년 전
부모
커밋
3306cd5a23
2개의 변경된 파일33개의 추가작업 그리고 1개의 파일을 삭제
  1. 10 1
      src/main/java/com/template/controller/HouseNumberStateController.java
  2. 23 0
      src/main/java/com/template/model/vo/RoomChangePageVo.java

+ 10 - 1
src/main/java/com/template/controller/HouseNumberStateController.java

@@ -1177,9 +1177,18 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 list.add(houseNumber2);
             }
         }
+        ArrayList<RoomChangePageVo> vos = new ArrayList<>();
+        for (House house : houses) {
+            RoomChangePageVo vo = new RoomChangePageVo();
+            String hoId = house.getId()+"";
 
+            List<HouseNumberVo> datas = list.stream().filter(e -> e.getHouseId().equals(hoId)).collect(Collectors.toList());
+            vo.setName(house.getRoomName());
+            vo.setChildren(datas);
+            vos.add(vo);
+        }
 
-        return CommonResult.ok(list);
+        return CommonResult.ok(vos);
     }
 
     @Override

+ 23 - 0
src/main/java/com/template/model/vo/RoomChangePageVo.java

@@ -0,0 +1,23 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RoomChangePageVo {
+//    /**
+//     * 数据ID
+//     */
+//    private String id;
+
+    /**
+     * 部门名称
+     */
+    private String name;
+
+    /**
+     * 子级部门
+     */
+    private List<HouseNumberVo> children;
+}