Merge branch 'dev'

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

@@ -16,6 +16,8 @@ public class HouseResourceProfileGraph {
 
     private BigDecimal kzArea;
 
+    private long kzCount;
+
     @Deprecated
     private BigDecimal jzArea;
 

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

@@ -16,4 +16,16 @@ public class PageBusinessEntityStatisticsDetail {
     private long scCount;
 
     private long totalCount;
+
+    private long sjLyCount;
+
+    private long sjDlCount;
+
+    private long sjJqCount;
+
+    private long sjZhtCount;
+
+    private long sjScCount;
+
+    private long sjTotalCount;
 }

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

@@ -172,6 +172,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
                 houseResourceProfileGraph.setWgName(wgName);
             }
             houseResourceProfileGraph.setJyArea(v.stream().map(HouseResourcePage::getHouseArea).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+            houseResourceProfileGraph.setKzCount(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).count());
             houseResourceProfileGraph.setKzArea(v.stream().filter(x -> x.getHouseResourceType() == HouseEnums.HouseResourceTypeEnum.KZ.getCode()).map(HouseResourcePage::getHouseArea).reduce(BigDecimal.ZERO, BigDecimal::add));
             List<HouseResourcePage> houseResourcePages = handleHouseList(v);
             houseResourceProfileGraph.setHouseResources(houseResourcePages.stream().sorted(Comparator.comparing(HouseResourcePage::getHouseNumber)).collect(Collectors.toList()));
@@ -317,6 +318,9 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         pageBusinessEntityStatisticsDetail.setZhtCount(result.stream().filter(x -> x.getType() == 6).count());
         pageBusinessEntityStatisticsDetail.setScCount(result.stream().filter(x -> x.getType() == 7).count());
         pageBusinessEntityStatisticsDetail.setTotalCount(result.size());
+
+        Map<String, List<HouseResource>> collect = result.stream().collect(Collectors.groupingBy(HouseResource::getThree));
+        pageBusinessEntityStatisticsDetail.setSjTotalCount(collect.size());
         return pageBusinessEntityStatisticsDetail;
     }
 

ruoyi-system/src/main/resources/mapper/house/HouseResourceMapper.xml

@@ -156,9 +156,7 @@
                 and t4.year_sell <![CDATA[ >= ]]> #{query.yearSellMin} and t4.year_sell <![CDATA[ <= ]]> #{query.yearSellMax}
             </if>
         </where>
-        <if test="query.sortWay != null and query.sortWay != ''">
-            order by t1.house_area ${query.sortWay}
-        </if>
+        GROUP BY t1.id
     </select>
     <select id="selectProfileGraph" resultType="com.ruoyi.system.domain.house.vo.HouseResourcePage">
         SELECT