From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 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 b963baa..cad5227 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
@@ -319,8 +319,9 @@
      * @return
      */
     @GetMapping("/area/all")
-    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
-        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
+    public R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
+                                @RequestParam(value = "areaCode", required = false) String areaCode) {
+        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode, areaCode);
     }
 
     /**
@@ -333,6 +334,17 @@
     @PostMapping("/population/page")
     public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
         return comMngPopulationService.pagePopulation(comMngPopulationVO);
+    }
+    /**
+     * 社区后台老人导出管理列表
+     *
+     * @param comMngPopulationVO
+     *            查询参数
+     * @return 实有人口分页查询结果
+     */
+    @PostMapping("/population/exportOld")
+    public R exportOld(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
+        return comMngPopulationService.exportOld(comMngPopulationVO);
     }
 
     /**
@@ -946,4 +958,17 @@
     public R detailHousesUser(@RequestParam("id") Long id) {
         return comMngPopulationHouseUserService.detail(id);
     }
+
+    /**
+     * 历史数据人员类型填充
+     * @param newVoList
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/history/filled")
+    public R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
+        return comMngPopulationService.filledPopulationPersonType(newVoList, communityId, userId);
+    }
 }

--
Gitblit v1.7.1