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/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java |  103 +++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 99 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
index 69f6277..7c6f48c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -15,12 +15,11 @@
 import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
 import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
+import com.panzhihua.common.model.vos.community.*;
 import com.panzhihua.common.model.vos.user.ComMngTagVO;
 import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
 import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -80,8 +79,96 @@
      * @param communityId
      * @return
      */
-    R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception;
+    R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId);
 
+    /**
+     * 导入吸毒人员
+     * @param list
+     * @param communityId
+     * @return
+     */
+    R listSaveDrugPopulation(List<ComMngPopulationDrugExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入社区矫正人员
+     *
+     * @param list        社区矫正人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveCorrectPopulation(List<ComMngPopulationCorrectExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入重精人员
+     *
+     * @param list        重精人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入邪教人员
+     *
+     * @param list        邪教人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入刑释人员
+     *
+     * @param list        刑释人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入重点上访人员
+     *
+     * @param list        重点上访人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入服刑人员
+     *
+     * @param list        服刑人员数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入退役军人
+     *
+     * @param list        退役军人数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveVeteransPopulation(List<ComMngPopulationVeteransExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入残疾人
+     *
+     * @param list        残疾人数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId);
+
+    /**
+     * 批量导入低保户
+     *
+     * @param list        低保户数据
+     * @param communityId 社区id
+     * @return 导入结果
+     */
+    R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId);
     /**
      * 确认导入实有人口（有则更新，无则新建）
      *
@@ -123,6 +210,14 @@
     R getPopulationLists(List<Long> Ids);
 
     /**
+     * 根据小区id查询实有人口
+     *
+     * @param villageId 小区id
+     * @return 查询结果
+     */
+    R getPopulationListByVillageId(Long villageId);
+
+    /**
      * 编辑实有人口
      *
      * @param populationEditDTO

--
Gitblit v1.7.1