From b500fcb5f25d0f1f0e31304fd1fa340e84360f3a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期六, 22 五月 2021 10:56:41 +0800
Subject: [PATCH] 实有人口优化

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index bf3e358..e496290 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -39,6 +39,8 @@
     private ComMngProvinceService comMngProvinceService;
     @Resource
     private ComMngPopulationService comMngPopulationService;
+    @Resource
+    private ComMngPopulationHouseService comMngPopulationHouseService;
 
 
     /**
@@ -354,12 +356,12 @@
 
     /**
      * 编辑实有人口
-     * @param editComMngPopulationVO
+     * @param populationEditDTO
      * @return
      */
     @PostMapping("/population/edit")
-    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
-        return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId);
+    R editPopulation(@RequestBody ComMngPopulationEditDTO populationEditDTO,@RequestParam("communityId") Long communityId) throws Exception{
+        return comMngPopulationService.editPopulation(populationEditDTO, communityId);
     }
 
     /**
@@ -392,4 +394,24 @@
         return comMngPopulationService.editUserElectronicFile(userElectronicFileVO);
     }
 
+    /**
+     * 实有人口统计
+     * @param communityId   社区id
+     * @return  统计结果
+     */
+    @PostMapping("/population/Statistics")
+    public R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId) {
+        return comMngPopulationService.getPopulationTotalByAdmin(communityId);
+    }
+
+    /**
+     * 查询房屋级联菜单
+     * @param cascadeHouseDTO   请求参数
+     * @return  菜单列表
+     */
+    @PostMapping("/population/cascade/list")
+    public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO){
+        return comMngPopulationHouseService.getCascadeHouseAddress(cascadeHouseDTO);
+    }
+
 }

--
Gitblit v1.7.1