From b00e99040a54b9342debd14fa82b14b0aab1cea0 Mon Sep 17 00:00:00 2001
From: luoyuanqiao <2376770955@qq.com>
Date: 星期四, 24 二月 2022 11:25:43 +0800
Subject: [PATCH] bug修复

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index aec8fc7..119e327 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -2531,6 +2531,17 @@
     R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
 
     /**
+     * 导出老人
+     *
+     * @param comMngPopulationVO
+     *            查询参数
+     * @return 分页集合
+     */
+    @PostMapping("/common/data/population/exportOld")
+    R exportOld(ComMngPopulationDTO comMngPopulationVO);
+
+
+    /**
      * 根据身份证查询实有人口信息
      */
     @GetMapping("/common/data/population/selectByIdCard")
@@ -4970,7 +4981,7 @@
      * @return 社区列表
      */
     @GetMapping("/eventgrid/community/westList")
-    R getWestCommunityLists(String areaCode);
+    R getWestCommunityLists(@RequestParam("areaCode")String areaCode);
 
     /**
      * 综治app-小区列表
@@ -5533,7 +5544,7 @@
      * @return 随手拍分类列表
      */
     @GetMapping("/classify/admin/list")
-    R listPhotoClassify();
+    R listPhotoClassify(@RequestParam("areaCode") String areaCode);
 
     /**
      * 社区后台-切换随手拍公示状态
@@ -5759,6 +5770,14 @@
      */
     @PostMapping("/reserve/admin/register/detailed/list")
     R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+    /**
+     * 导出登记明细列表
+     * @param detailedAdminDTO  请求参数
+     * @return  登记明细列表
+     */
+    @PostMapping("/reserve/admin/register/detailed/list/export")
+    R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
 
     /**
      * 查询登记详情记录
@@ -6372,7 +6391,7 @@
      * @return
      */
     @GetMapping("/convenient/service-category/all")
-    R getAllServiceCategories();
+    R getAllServiceCategories(@RequestParam("areaCode") String areaCode);
 
     /**
      * 获取用户便民服务商家详情
@@ -6493,7 +6512,7 @@
      * @return
      */
     @GetMapping("/convenient/service-category/suitable")
-    R getSuitableServiceCategories(@RequestParam("communityId") Long communityId);
+    R getSuitableServiceCategories(@RequestParam("communityId") Long communityId,@RequestParam("areaCode")String areaCode);
 
     /**
      * 获取该社区下的热门商家
@@ -8259,4 +8278,26 @@
      */
     @GetMapping("/microcommercialstreet/endStatusForMcsGame")
     R endStatusForMcsGame();
+
+    @GetMapping("/reserve/record/delete")
+    R deleteRecord(@RequestParam("recordId")Long recordId);
+
+    /**
+     * 历史数据人员类型填充
+     * @param newVoList
+     * @param communityId
+     * @param userId
+     * @return
+     */
+    @PostMapping("/common/data/history/filled")
+    R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId);
+
+    /**
+     * 根据小区id查询楼栋列表
+     * @param villageId 小区id
+     * @return  查询楼栋列表
+     */
+    @GetMapping("/building/getBuildListByVillageId")
+    R getBuildListByVillageId(@RequestParam(value = "villageId") Long villageId);
 }

--
Gitblit v1.7.1