Merge branch 'dev'

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

@@ -65,8 +65,8 @@ public class HouseResourceController {
     }
 
     @GetMapping("/businessEntityStatistics")
-    public AjaxResult getBusinessEntityStatistics(@RequestParam(required = false) String two, @RequestParam(required = false) String three) {
-        return AjaxResult.success(houseResourceService.businessEntityStatistics(two, three));
+    public AjaxResult getBusinessEntityStatistics(HouseResourcePageQuery query) {
+        return AjaxResult.success(houseResourceService.businessEntityStatistics(query));
     }
 
     @PostMapping("/page/businessEntityStatistics")

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

@@ -99,4 +99,8 @@ public class HouseResourcePage {
     private List<String> businessEntityInfoNames;
 
     private BigDecimal income;
+
+    private String nature;
+
+    private String industryClassification;
 }

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

@@ -41,4 +41,16 @@ public class HouseResourcePageQuery extends PageDomain {
     private List<String> wgCodes;
 
     private String name;
+
+    private boolean zlFlag;
+
+    private boolean zyFlag;
+
+    private boolean qtFlag;
+
+    private boolean zaiyingFlag;
+
+    private boolean xzFlag;
+
+    private boolean gkFlag;
 }

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

@@ -24,7 +24,7 @@ public interface HouseResourceService {
 
     List<HouseResourcePage> listHouseResources(HouseResourcePageQuery query);
 
-    BusinessEntityStatisticsDetail businessEntityStatistics(String two, String three);
+    BusinessEntityStatisticsDetail businessEntityStatistics(HouseResourcePageQuery query);
 
     PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(PageBusinessEntityStatisticsQuery query);
 }

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

@@ -195,6 +195,24 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         if (Objects.nonNull(query.getYearSellMax())) {
             houseResourcePages = houseResourcePages.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMax()) <= 0).collect(Collectors.toList());
         }
+        if (query.isZlFlag()) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceAttribute() == 0).collect(Collectors.toList());
+        }
+        if (query.isZyFlag()) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceAttribute() == 2).collect(Collectors.toList());
+        }
+        if (query.isQtFlag()) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceAttribute() == 1).collect(Collectors.toList());
+        }
+        if (query.isZaiyingFlag()) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceType() == 0).collect(Collectors.toList());
+        }
+        if (query.isXzFlag()) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceType() == 1).collect(Collectors.toList());
+        }
+        if (query.isGkFlag()) {
+            houseResourcePages = houseResourcePages.stream().filter(x -> x.getHouseResourceType() == 2).collect(Collectors.toList());
+        }
         List<HouseResourceProfileGraph> resourceProfileGraphList = new ArrayList<>();
         Map<String, List<HouseResourcePage>> collect = houseResourcePages.stream().collect(Collectors.groupingBy(HouseResourcePage::getFour));
         collect.forEach((k, v) -> {
@@ -229,17 +247,37 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     @Override
-    public BusinessEntityStatisticsDetail businessEntityStatistics(String two, String three) {
-        List<HouseResource> list = houseResourceMapper.selectAll();
-        if (CollectionUtils.isEmpty(list)) {
+    public BusinessEntityStatisticsDetail businessEntityStatistics(HouseResourcePageQuery query) {
+        List<HouseResourcePage> listPages = houseResourceMapper.selectProfileGraph(query);
+        listPages.forEach(x -> x.setIncome(businessEntityInfoMapper.selectYearSellByHouseResourceId(x.getId())));
+        if (CollectionUtils.isEmpty(listPages)) {
             return new BusinessEntityStatisticsDetail();
         }
+        List<HouseResourcePage> list = handleHouseList(listPages);
         BusinessEntityStatisticsDetail businessEntityStatisticsDetail = new BusinessEntityStatisticsDetail();
-        if (StringUtils.hasText(two)) {
-            list = list.stream().filter(x -> x.getTwo().equals(two)).collect(Collectors.toList());
+        if (StringUtils.hasText(query.getTwo())) {
+            list = list.stream().filter(x -> x.getTwo().equals(query.getTwo())).collect(Collectors.toList());
+        }
+        if (StringUtils.hasText(query.getThree())) {
+            list = list.stream().filter(x -> x.getThree().equals(query.getThree())).collect(Collectors.toList());
+        }
+        if (CollectionUtils.isEmpty(list)) {
+            return businessEntityStatisticsDetail;
+        }
+        if (StringUtils.hasText(query.getName())) {
+            list = list.stream().filter(x -> !CollectionUtils.isEmpty(x.getBusinessEntityInfoNames())).filter(x -> x.getBusinessEntityInfoNames().contains(query.getName())).collect(Collectors.toList());
+        }
+        if (Objects.nonNull(query.getHouseAreaMin())) {
+            list = list.stream().filter(x -> Objects.nonNull(x.getHouseArea())).filter(x -> x.getHouseArea().compareTo(query.getHouseAreaMin()) >= 0).collect(Collectors.toList());
         }
-        if (StringUtils.hasText(three)) {
-            list = list.stream().filter(x -> x.getThree().equals(three)).collect(Collectors.toList());
+        if (Objects.nonNull(query.getHouseAreaMax())) {
+            list = list.stream().filter(x -> Objects.nonNull(x.getHouseArea())).filter(x -> x.getHouseArea().compareTo(query.getHouseAreaMax()) <= 0).collect(Collectors.toList());
+        }
+        if (Objects.nonNull(query.getYearSellMin())) {
+            list = list.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMin()) >= 0).collect(Collectors.toList());
+        }
+        if (Objects.nonNull(query.getYearSellMax())) {
+            list = list.stream().filter(x -> x.getIncome().compareTo(query.getYearSellMax()) <= 0).collect(Collectors.toList());
         }
         if (CollectionUtils.isEmpty(list)) {
             return businessEntityStatisticsDetail;
@@ -250,11 +288,11 @@ 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.setSjLyCount(list.stream().filter(x -> x.getType() == 1).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
+        businessEntityStatisticsDetail.setSjJqCount(list.stream().filter(x -> x.getType() == 4).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
+        businessEntityStatisticsDetail.setSjJqCount(list.stream().filter(x -> x.getType() == 5).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
+        businessEntityStatisticsDetail.setSjZhtCount(list.stream().filter(x -> x.getType() == 6).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
+        businessEntityStatisticsDetail.setSjScCount(list.stream().filter(x -> x.getType() == 7).collect(Collectors.groupingBy(HouseResourcePage::getThree)).size());
 
         businessEntityStatisticsDetail.setZlCount(list.stream().filter(x -> x.getHouseResourceAttribute() == 0).count());
         businessEntityStatisticsDetail.setZyCount(list.stream().filter(x -> x.getHouseResourceAttribute() == 2).count());
@@ -265,7 +303,7 @@ public class HouseResourceServiceImpl implements HouseResourceService {
         businessEntityStatisticsDetail.setGkCount(list.stream().filter(x -> x.getHouseResourceType() == 2).count());
         businessEntityStatisticsDetail.setZyzyCount(list.stream().filter(x -> x.getHouseResourceType() == 4).count());
 
-        List<String> houseResourceIds = list.stream().map(HouseResource::getId).collect(Collectors.toList());
+        List<String> houseResourceIds = list.stream().map(HouseResourcePage::getId).collect(Collectors.toList());
         List<BusinessEntityInfo> businessEntityInfos = businessEntityInfoMapper.selectAllBusinessEntityInfosByHouseResourceIds(houseResourceIds);
         if (CollectionUtils.isEmpty(businessEntityInfos)) {
             return businessEntityStatisticsDetail;

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

@@ -120,7 +120,9 @@
         SELECT
         t2.wg_name AS wgName4,
         t1.*,
-        SUM(t4.year_sell) AS income
+        SUM(t4.year_sell) AS income,
+        t3.nature,
+        t3.industry_classification
         FROM
         house_resource t1
         LEFT JOIN grid_region t2 ON t2.wg_code = t1.four