From 51508c8c63bb072739a0e3ae45cb11e7599c8f66 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期五, 20 八月 2021 10:12:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 7c6f48c..3f48d8d 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
@@ -79,7 +79,7 @@
      * @param communityId
      * @return
      */
-    R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId);
+    R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId, Long userId);
 
     /**
      * 导入吸毒人员
@@ -87,7 +87,7 @@
      * @param communityId
      * @return
      */
-    R listSaveDrugPopulation(List<ComMngPopulationDrugExcelVO> list, Long communityId);
+    R listSaveDrugPopulation(List<ComMngPopulationDrugExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入社区矫正人员
@@ -96,7 +96,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveCorrectPopulation(List<ComMngPopulationCorrectExcelVO> list, Long communityId);
+    R listSaveCorrectPopulation(List<ComMngPopulationCorrectExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入重精人员
@@ -105,7 +105,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId);
+    R listSaveMajorPopulation(List<ComMngPopulationMajorExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入邪教人员
@@ -114,7 +114,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId);
+    R listSaveCultPopulation(List<ComMngPopulationCultExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入刑释人员
@@ -123,7 +123,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId);
+    R listSaveRehabilitationPopulation(List<ComMngPopulationRehabilitationExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入重点上访人员
@@ -132,7 +132,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId);
+    R listSaveKeyPopulation(List<ComMngPopulationKeyExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入服刑人员
@@ -141,7 +141,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId);
+    R listSaveSentencePopulation(List<ComMngPopulationSentenceExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入退役军人
@@ -150,7 +150,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveVeteransPopulation(List<ComMngPopulationVeteransExcelVO> list, Long communityId);
+    R listSaveVeteransPopulation(List<ComMngPopulationVeteransExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入残疾人
@@ -159,7 +159,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId);
+    R listSaveDisabilityPopulation(List<ComMngPopulationDisabilityExcelVO> list, Long communityId, Long userId);
 
     /**
      * 批量导入低保户
@@ -168,7 +168,7 @@
      * @param communityId 社区id
      * @return 导入结果
      */
-    R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId);
+    R listSaveLowSecurityPopulation(List<ComMngPopulationLowSecurityExcelVO> list, Long communityId, Long userId);
     /**
      * 确认导入实有人口（有则更新，无则新建）
      *

--
Gitblit v1.7.1