From e70053d772947e6e50cfa42f5a544a009699c4ac Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 17:31:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 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 ca9400d..3ae1728 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
@@ -1703,6 +1703,36 @@
     R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
 
     /**
+     * 批量导入吸毒人员
+     *
+     * @param list        吸毒人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importDrug")
+    R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入社区矫正人员
+     *
+     * @param list        社区矫正人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importCorrect")
+    R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
+     * 批量导入重精人员
+     *
+     * @param list        重精人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    @PostMapping("/common/data/population/importMajor")
+    R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+
+    /**
      * 确认导入实有人口(有则更新,无则新建)
      *
      * @param list        用户信息

--
Gitblit v1.7.1