feat: 房源

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

@@ -78,8 +78,8 @@ public class HouseResourceController {
         return AjaxResult.success(houseResourceService.listHouseResources(query));
     }
 
-    @GetMapping("/businessEntityStatistics")
-    public AjaxResult getBusinessEntityStatistics(HouseResourcePageQuery query) {
+    @PostMapping("/businessEntityStatistics")
+    public AjaxResult getBusinessEntityStatistics(@RequestBody HouseResourcePageQuery query) {
         return AjaxResult.success(houseResourceService.businessEntityStatistics(query));
     }
 

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

@@ -322,39 +322,11 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     @Override
     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, true);
         BusinessEntityStatisticsDetail businessEntityStatisticsDetail = new BusinessEntityStatisticsDetail();
-        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 (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;
-        }
         businessEntityStatisticsDetail.setLyCount(list.stream().filter(x -> x.getType() == 1).count());
         businessEntityStatisticsDetail.setJdCount(list.stream().filter(x -> x.getType() == 4).count());
         businessEntityStatisticsDetail.setJqCount(list.stream().filter(x -> x.getType() == 5).count());