From afc3a94e99d1a2403449e86bc38e7616c5b1a883 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 29 一月 2022 12:45:31 +0800
Subject: [PATCH] 预约登记优化

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 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 fb0cd5e..de2dfdb 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")
@@ -5761,6 +5772,14 @@
     R registerDetailedListAdmin(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
 
     /**
+     * 导出登记明细列表
+     * @param detailedAdminDTO  请求参数
+     * @return  登记明细列表
+     */
+    @PostMapping("/reserve/admin/register/detailed/list/export")
+    R registerDetailedListAdminExport(@RequestBody PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+    /**
      * 查询登记详情记录
      * @param reserveRecordId   登记记录id
      * @return  登记详情记录
@@ -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);
 
     /**
      * 获取该社区下的热门商家
@@ -8262,4 +8281,15 @@
 
     @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);
 }

--
Gitblit v1.7.1