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/api/CommonDataApi.java |   44 ++++++++++++++++++++++----------------------
 1 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
index 9495977..f758ce3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -325,8 +325,8 @@
      */
     @PostMapping("/population/import")
     @Transactional(rollbackFor = Exception.class)
-    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSavePopulation(list, communityId);
+    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSavePopulation(list, communityId, userId);
     }
 
     /**
@@ -338,8 +338,8 @@
      */
     @PostMapping("population/importDrug")
     @Transactional(rollbackFor = Exception.class)
-    public R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveDrugPopulation(list, communityId);
+    public R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveDrugPopulation(list, communityId, userId);
     }
 
     /**
@@ -351,8 +351,8 @@
      */
     @PostMapping("population/importCorrect")
     @Transactional(rollbackFor = Exception.class)
-    public R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveCorrectPopulation(list, communityId);
+    public R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveCorrectPopulation(list, communityId, userId);
     }
 
     /**
@@ -364,8 +364,8 @@
      */
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("population/importMajor")
-    public R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveMajorPopulation(list, communityId);
+    public R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveMajorPopulation(list, communityId, userId);
     }
 
     /**
@@ -377,8 +377,8 @@
      */
     @PostMapping("population/importCult")
     @Transactional(rollbackFor = Exception.class)
-    public R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveCultPopulation(list, communityId);
+    public R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveCultPopulation(list, communityId, userId);
     }
 
     /**
@@ -390,8 +390,8 @@
      */
     @PostMapping("population/importRehabilitation")
     @Transactional(rollbackFor = Exception.class)
-    public R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId);
+    public R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId, userId);
     }
 
     /**
@@ -403,8 +403,8 @@
      */
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("population/importKey")
-    public R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveKeyPopulation(list, communityId);
+    public R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveKeyPopulation(list, communityId, userId);
     }
 
     /**
@@ -416,8 +416,8 @@
      */
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("population/importSentence")
-    public R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveSentencePopulation(list, communityId);
+    public R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveSentencePopulation(list, communityId, userId);
     }
 
     /**
@@ -429,8 +429,8 @@
      */
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("population/importVeterans")
-    public R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveVeteransPopulation(list, communityId);
+    public R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveVeteransPopulation(list, communityId, userId);
     }
 
     /**
@@ -442,8 +442,8 @@
      */
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("population/importDisability")
-    public R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId){
-        return comMngPopulationService.listSaveDisabilityPopulation(list, communityId);
+    public R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+        return comMngPopulationService.listSaveDisabilityPopulation(list, communityId, userId);
     }
 
     /**
@@ -455,8 +455,8 @@
      */
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("/population/importLowSecurity")
-    public R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId) {
-        return comMngPopulationService.listSaveLowSecurityPopulation(list, communityId);
+    public R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
+        return comMngPopulationService.listSaveLowSecurityPopulation(list, communityId, userId);
     }
 
     /**

--
Gitblit v1.7.1