Merge branch 'dev-lx' into dev

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

@@ -4,6 +4,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.vo.HouseResourcePageQuery;
 import com.ruoyi.system.domain.house.vo.HouseResourceSaveUpdateDto;
+import com.ruoyi.system.domain.house.vo.PageBusinessEntityStatisticsQuery;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.web.bind.annotation.*;
 
@@ -68,8 +69,8 @@ public class HouseResourceController {
         return AjaxResult.success(houseResourceService.businessEntityStatistics(two));
     }
 
-    @GetMapping("/page/businessEntityStatistics")
-    public AjaxResult getPageBusinessEntityStatistics(@RequestParam(required = false) List<String> twos) {
-        return AjaxResult.success(houseResourceService.pageBusinessEntityStatistics(twos));
+    @PostMapping("/page/businessEntityStatistics")
+    public AjaxResult getPageBusinessEntityStatistics(@RequestBody PageBusinessEntityStatisticsQuery query) {
+        return AjaxResult.success(houseResourceService.pageBusinessEntityStatistics(query));
     }
 }

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

+package com.ruoyi.system.domain.house.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PageBusinessEntityStatisticsQuery {
+
+    private List<String> twos;
+}

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

@@ -26,5 +26,5 @@ public interface HouseResourceService {
 
     BusinessEntityStatisticsDetail businessEntityStatistics(String two);
 
-    PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(List<String> twos);
+    PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(PageBusinessEntityStatisticsQuery query);
 }

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

@@ -285,13 +285,13 @@ public class HouseResourceServiceImpl implements HouseResourceService {
     }
 
     @Override
-    public PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(List<String> twos) {
+    public PageBusinessEntityStatisticsDetail pageBusinessEntityStatistics(PageBusinessEntityStatisticsQuery query) {
         List<HouseResource> list = houseResourceMapper.selectAll();
         if (CollectionUtils.isEmpty(list)) {
             return new PageBusinessEntityStatisticsDetail();
         }
-        if (!CollectionUtils.isEmpty(twos)) {
-            list = list.stream().filter(x -> twos.contains(x.getTwo())).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(query.getTwos())) {
+            list = list.stream().filter(x -> query.getTwos().contains(x.getTwo())).collect(Collectors.toList());
         }
         if (CollectionUtils.isEmpty(list)) {
             return new PageBusinessEntityStatisticsDetail();