From 2e6ae80c0271e5e45faa399ce94cd44678cce43f Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 13 八月 2021 22:58:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 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 5662218..1e8201e 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
@@ -1744,6 +1744,66 @@
     R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId);
 
     /**
+     * 批量导入刑释人员
+     *
+     * @param list        刑释人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importRehabilitation")
+    R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入重点上访人员
+     *
+     * @param list        重点上访人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importKey")
+    R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入服刑人员
+     *
+     * @param list        服刑人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importSentence")
+    R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入退役军人
+     *
+     * @param list        退役军人数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importVeterans")
+    R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入残疾人
+     *
+     * @param list        残疾人数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importDisability")
+    R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入低保户
+     *
+     * @param list        低保户数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importLowSecurity")
+    R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
      * 确认导入实有人口(有则更新,无则新建)
      *
      * @param list        用户信息

--
Gitblit v1.7.1