feat: 房源

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

@@ -45,6 +45,8 @@ public class BusinessEntityStatisticsDetail {
 
     private long ztCount;
 
+    private long gsCount;
+
     private BigDecimal gyCount = BigDecimal.ZERO;
 
     private BigDecimal jzyCount = BigDecimal.ZERO;
@@ -62,4 +64,8 @@ public class BusinessEntityStatisticsDetail {
     private BigDecimal qtjjfzCount = BigDecimal.ZERO;
 
     private BigDecimal jjzl = BigDecimal.ZERO;
+
+    private BigDecimal xsCount = BigDecimal.ZERO;
+
+    private BigDecimal ssCount = BigDecimal.ZERO;
 }

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

@@ -102,6 +102,8 @@ public class HouseResourcePage {
 
     private BigDecimal income;
 
+    private BigDecimal taxCount;
+
     private String nature;
 
     private String industryClassification;

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

@@ -409,6 +409,10 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         businessEntityStatisticsDetail.setSbCount(list.stream().filter(x -> x.getHouseResourceType() == 3).count());
         businessEntityStatisticsDetail.setZyzyCount(list.stream().filter(x -> x.getHouseResourceType() == 4).count());
 
+        businessEntityStatisticsDetail.setXsCount(list.stream().map(HouseResourcePage::getIncome).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+        businessEntityStatisticsDetail.setSsCount(list.stream().map(HouseResourcePage::getTaxCount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
+        businessEntityStatisticsDetail.setGsCount(list.stream().filter(x -> x.getGs().equals(Boolean.TRUE)).count());
+
         List<String> houseResourceIds = list.stream().map(HouseResourcePage::getId).collect(Collectors.toList());
         List<HouseResourceBusinessEntityInfoMapping> houseResourceMappings = houseResourceBusinessEntityInfoMappingMapper.selectByHouseResourceIds(houseResourceIds);
         if (CollectionUtils.isEmpty(houseResourceMappings)) {
@@ -543,7 +547,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     private List<HouseResourcePage> handleHouseList(List<HouseResourcePage> list, boolean houseNumberSortFlag) {
-        list.forEach(x -> {
+        list.parallelStream().forEach(x -> {
             GridRegionExample twoExample = new GridRegionExample();
             twoExample.createCriteria().andWgTypeEqualTo(String.valueOf(x.getType())).andWgCodeEqualTo(x.getTwo());
             List<GridRegion> two = gridRegionMapper.selectByExample(twoExample);

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

@@ -291,6 +291,7 @@
         t2.wg_name AS wgName4,
         t1.*,
         SUM(t5.year_sell) AS income,
+        SUM(t5.year_tax) AS taxCount,
         t4.nature,
         t4.industry_classification,
         ROUND(IFNULL(t1.unit_price,0) * 10000 / 365 / t1.house_area, 1) AS dayPrice,