Merge branch 'dev' into 'main'

Dev

See merge request !170

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -67,4 +67,9 @@ public class HouseResourceController {
     public AjaxResult getBusinessEntityStatistics(@RequestParam(required = false) String two) {
         return AjaxResult.success(houseResourceService.businessEntityStatistics(two));
     }
+
+    @GetMapping("/page/businessEntityStatistics")
+    public AjaxResult getPageBusinessEntityStatistics(List<String> twos) {
+        return AjaxResult.success(houseResourceService.pageBusinessEntityStatistics(twos));
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/house/vo/PageBusinessEntityStatisticsDetail.java

+package com.ruoyi.system.domain.house.vo;
+
+import lombok.Data;
+
+@Data
+public class PageBusinessEntityStatisticsDetail {
+
+    private long lyCount;
+
+    private long dlCount;
+
+    private long jqCount;
+
+    private long zhtCount;
+
+    private long scCount;
+
+    private long totalCount;
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/house/HouseResourceService.java

@@ -25,4 +25,6 @@ public interface HouseResourceService {
     List<HouseResourcePage> listHouseResources(HouseResourcePageQuery query);
 
     BusinessEntityStatisticsDetail businessEntityStatistics(String two);
+
+    PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(List<String> twos);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/house/impl/HouseResourceServiceImpl.java

@@ -284,6 +284,28 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         return businessEntityStatisticsDetail;
     }
 
+    @Override
+    public PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(List<String> twos) {
+        List<HouseResource> list = houseResourceMapper.selectAll();
+        if (CollectionUtils.isEmpty(list)) {
+            return new PageBusinessEntityStatisticsDetail();
+        }
+        if (!CollectionUtils.isEmpty(twos)) {
+            list = list.stream().filter(x -> twos.contains(x.getTwo())).collect(Collectors.toList());
+        }
+        if (CollectionUtils.isEmpty(list)) {
+            return new PageBusinessEntityStatisticsDetail();
+        }
+        PageBusinessEntityStatisticsDetail pageBusinessEntityStatisticsDetail = new PageBusinessEntityStatisticsDetail();
+        pageBusinessEntityStatisticsDetail.setLyCount(list.stream().filter(x -> x.getType() == 1).count());
+        pageBusinessEntityStatisticsDetail.setDlCount(list.stream().filter(x -> x.getType() == 4).count());
+        pageBusinessEntityStatisticsDetail.setJqCount(list.stream().filter(x -> x.getType() == 5).count());
+        pageBusinessEntityStatisticsDetail.setZhtCount(list.stream().filter(x -> x.getType() == 6).count());
+        pageBusinessEntityStatisticsDetail.setScCount(list.stream().filter(x -> x.getType() == 7).count());
+        pageBusinessEntityStatisticsDetail.setTotalCount(list.size());
+        return pageBusinessEntityStatisticsDetail;
+    }
+
     private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list) {
         list.forEach(x -> {
             GridRegionExample twoExample = new GridRegionExample();