From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 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..ecf66ca 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,7 +79,43 @@
* @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);
+
/**
* 确认导入实有人口（有则更新，无则新建）
@@ -123,6 +158,14 @@
R getPopulationLists(List<Long> Ids);
/**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ R getPopulationListByVillageId(Long villageId);
+
+ /**
* 编辑实有人口
*
* @param populationEditDTO
--
Gitblit v1.7.1