From c2197723fdd911962372c58499171d8c909b8ebc Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 04 八月 2021 17:33:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 f8b662a..45c554b 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;
@@ -83,6 +82,33 @@
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 用户信息
--
Gitblit v1.7.1