From 2eea3290641657d2ee13edd90d27f8b2ec01c209 Mon Sep 17 00:00:00 2001
From: 罗yu 元桥 <2376770955@qq.com>
Date: 星期六, 08 五月 2021 18:23:48 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java |   31 +++++++++++++++++++++++++++++--
 1 files changed, 29 insertions(+), 2 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 211d731..e593147 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
@@ -2,11 +2,11 @@
 
 import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
 import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+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 org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
 
 import java.util.List;
 
@@ -100,5 +100,32 @@
      */
     R getPopulationLists(List<Long> Ids);
 
+    /**
+     * 编辑实有人口
+     * @param editComMngPopulationVO
+     * @param communityId
+     * @return
+     */
+    R editPopulation(EditComMngPopulationVO editComMngPopulationVO, Long communityId);
 
+    /**
+     * 分页查询特殊群体
+     * @param pageInputUserDTO  请求参数
+     * @return  特殊群体列表
+     */
+    R specialInputUser(PageInputUserDTO pageInputUserDTO);
+
+    /**
+     * 删除特殊群体人员
+     * @param id    特殊群体id
+     * @return  删除结果
+     */
+    R deleteSpecialInputUser(Long id);
+
+    /**
+     * 查询实有人口电子档信息
+     * @param populationId  实有人口id
+     * @return  实有人口电子档信息
+     */
+    R electronicArchivesPopulation(Long populationId);
 }

--
Gitblit v1.7.1