From 0bf174be571c53b8af796eca4b51fcd3edec1657 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期日, 25 四月 2021 21:55:43 +0800
Subject: [PATCH] no

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 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 90be175..40a1599 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
@@ -3,7 +3,6 @@
 import com.panzhihua.common.model.dtos.community.*;
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.model.vos.community.*;
-import com.panzhihua.common.service.user.UserService;
 import com.panzhihua.service_community.service.*;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -277,6 +276,18 @@
     }
 
     /**
+     * 确认导入实有人口(有则更新,无则新建)
+     * @param list  用户信息
+     * @param communityId   社区id
+     * @return  导入结果
+     */
+    @PostMapping("/population/import/confirm")
+    @Transactional(rollbackFor = Exception.class)
+    public R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
+        return comMngPopulationService.listSavePopulationConfirm(list,communityId);
+    }
+
+    /**
      * 根据实有人口id查询详情
      * @param populationId 实有人口id
      * @return  实有人口详情查询结果
@@ -285,6 +296,7 @@
     public R detailPopulation(@RequestParam(value = "populationId") Long populationId) {
         return comMngPopulationService.detailPopulation(populationId);
     }
+
 
     /**
      * 根据实有人口id修改标签列表
@@ -328,4 +340,14 @@
     public R getPopulationLists(@RequestBody List<Long> Ids) {
         return comMngPopulationService.getPopulationLists(Ids);
     }
+
+    /**
+     * 编辑实有人口
+     * @param editComMngPopulationVO
+     * @return
+     */
+    @PostMapping("/population/edit")
+    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
+        return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId);
+    }
 }

--
Gitblit v1.7.1