feature: 房态调整

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/controller/PtAreaController.java

@@ -54,16 +54,18 @@ public class PtAreaController extends BaseController {
     }
 
     /**
-     * 查询非楼层的区域列表
+     * 查询有客房的区域列表
      * @param
      * @return
      */
-    @GetMapping("/listNoLC")
-    public R<List<PtAreaVo>> listNoLC() {
-        List<PtAreaVo> list = ptAreaService.queryListNoLC();
+    @GetMapping("/listHasKF")
+    public R<List<PtAreaVo>> listHasKF() {
+        List<PtAreaVo> list = ptAreaService.queryListHasKF();
         return R.ok(list);
     }
 
+
+
     /**
      * 查询楼层列表
      * @param bo

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/IPtAreaService.java

@@ -35,7 +35,7 @@ public interface IPtAreaService {
      * @return 建筑物区域列表
      */
     List<PtAreaVo> queryList(PtAreaBo bo);
-    List<PtAreaVo> queryListNoLC();
+    List<PtAreaVo> queryListHasKF();
     List<PtAreaVo> queryByLDList(List<PtAreaBo> dataList);
 
     List<PtAreaVo> queryListLD(Long areaId);

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtAreaServiceImpl.java

@@ -80,7 +80,7 @@ public class PtAreaServiceImpl implements IPtAreaService {
     }
 
     @Override
-    public List<PtAreaVo> queryListNoLC() {
+    public List<PtAreaVo> queryListHasKF() {
 //        lqw.notIn(PtArea::getAreaType, BuildAreaTypeEnum.LC.code());
 
         List<PtAreaVo> ptAreaVos = baseMapper.selectVoList();
@@ -104,8 +104,11 @@ public class PtAreaServiceImpl implements IPtAreaService {
                 .filter(ptRoomVo -> HotelRoomStatusEnum.OK.code().equals(ptRoomVo.getStatus())).count());
         });
 
+        //去掉没有客房的楼层
+        lcs = lcs.stream().filter(ptAreaVo -> ptAreaVo.getAllCount() > 0).toList();
+
         // 楼栋
-        List<PtAreaVo> lds = rs.stream().filter(ptAreaVo -> ptAreaVo.getAreaType().equals(BuildAreaTypeEnum.LD.code())).toList();
+        List<PtAreaVo> lds = rs.stream().filter(ptAreaVo -> BuildAreaTypeEnum.LD.code().equals(ptAreaVo.getAreaType())).toList();
 
         setCount(lcs, lds);
 
@@ -117,13 +120,13 @@ public class PtAreaServiceImpl implements IPtAreaService {
         // 校区
         List<PtAreaVo> xqs = vos.stream().filter(ptAreaVo -> ptAreaVo.getAreaType().equals(BuildAreaTypeEnum.XQ.code())).toList();
         // 排除 没有 子节点的 校区
-        List<PtAreaVo> result = vos.stream().filter(ptAreaVo -> {
+        List<PtAreaVo> result = new ArrayList<>(vos.stream().filter(ptAreaVo -> {
             if (ptAreaVo.getAreaType().equals(BuildAreaTypeEnum.XQ.code())) {
                 return vos.stream().anyMatch(ptAreaVo1 -> ptAreaVo1.getParentId().equals(ptAreaVo.getAreaId()));
             } else {
                 return true;
             }
-        }).toList();
+        }).toList());
         // 统计校区
         List<PtAreaVo> capList = result.stream().filter(ptAreaVo -> BuildAreaTypeEnum.XQ.code().equals(ptAreaVo.getAreaType())).toList();
         setCount(result, capList);
@@ -132,6 +135,9 @@ public class PtAreaServiceImpl implements IPtAreaService {
         List<PtAreaVo> schoolList = result.stream().filter(ptAreaVo -> BuildAreaTypeEnum.XX.code().equals(ptAreaVo.getAreaType())).toList();
         setCount(result, schoolList);
 
+        //加上楼层
+        result.addAll(lcs);
+
         return result;
     }