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/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 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 71b14a4..31c40fc 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
@@ -1702,7 +1702,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/import")
-    R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入吸毒人员
@@ -1712,7 +1712,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importDrug")
-    R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入社区矫正人员
@@ -1722,7 +1722,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importCorrect")
-    R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入重精人员
@@ -1732,7 +1732,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importMajor")
-    R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入邪教人员
@@ -1742,7 +1742,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importCult")
-    R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入刑释人员
@@ -1752,7 +1752,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importRehabilitation")
-    R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入重点上访人员
@@ -1762,7 +1762,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importKey")
-    R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入服刑人员
@@ -1772,7 +1772,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importSentence")
-    R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入退役军人
@@ -1782,7 +1782,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importVeterans")
-    R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入残疾人
@@ -1792,7 +1792,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importDisability")
-    R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 批量导入低保户
@@ -1802,7 +1802,7 @@
      * @return 导入结果
      */
     @PostMapping("/common/data/population/importLowSecurity")
-    R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId);
+    R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId);
 
     /**
      * 确认导入实有人口（有则更新，无则新建）

--
Gitblit v1.7.1