Merge branch 'dev'

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

@@ -17,6 +17,16 @@ public class BusinessEntityStatisticsDetail {
 
     private long zhtCount;
 
+    private long sjLyCount;
+
+    private long sjJqCount;
+
+    private long sjJdCount;
+
+    private long sjScCount;
+
+    private long sjZhtCount;
+
     private long zlCount;
 
     private long zyCount;

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

@@ -229,6 +229,12 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         businessEntityStatisticsDetail.setZhtCount(list.stream().filter(x -> x.getType() == 6).count());
         businessEntityStatisticsDetail.setScCount(list.stream().filter(x -> x.getType() == 7).count());
 
+        businessEntityStatisticsDetail.setSjLyCount(list.stream().filter(x -> x.getType() == 1).collect(Collectors.groupingBy(HouseResource::getThree)).size());
+        businessEntityStatisticsDetail.setSjJqCount(list.stream().filter(x -> x.getType() == 4).collect(Collectors.groupingBy(HouseResource::getThree)).size());
+        businessEntityStatisticsDetail.setSjJqCount(list.stream().filter(x -> x.getType() == 5).collect(Collectors.groupingBy(HouseResource::getThree)).size());
+        businessEntityStatisticsDetail.setSjZhtCount(list.stream().filter(x -> x.getType() == 6).collect(Collectors.groupingBy(HouseResource::getThree)).size());
+        businessEntityStatisticsDetail.setSjScCount(list.stream().filter(x -> x.getType() == 7).collect(Collectors.groupingBy(HouseResource::getThree)).size());
+
         businessEntityStatisticsDetail.setZlCount(list.stream().filter(x -> x.getHouseResourceAttribute() == 0).count());
         businessEntityStatisticsDetail.setZyCount(list.stream().filter(x -> x.getHouseResourceAttribute() == 1).count());
         businessEntityStatisticsDetail.setQtCount(list.stream().filter(x -> x.getHouseResourceAttribute() == 2).count());