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/api/CommonDataApi.java | 43 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 42 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 bcc388e..e134633 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
@@ -1,9 +1,9 @@
package com.panzhihua.service_community.api;
import com.panzhihua.common.model.dtos.community.*;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
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;
@@ -299,6 +299,17 @@
}
/**
+ * 查询实有人口电子档信息
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/population/electronicArchives")
+ public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
+ return comMngPopulationService.electronicArchivesPopulation(populationId);
+ }
+
+
+ /**
* 根据实有人口id修改标签列表
* @param populationTagDTO 请求参数
* @return 修改结果
@@ -340,4 +351,34 @@
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);
+ }
+
+ /**
+ * 分页查询特殊群体
+ * @param pageInputUserDTO 请求参数
+ * @return 特殊群体列表
+ */
+ @PostMapping("/special/page")
+ public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
+ return comMngPopulationService.specialInputUser(pageInputUserDTO);
+ }
+
+ /**
+ * 删除特殊群体人员
+ * @param id 特殊群体id
+ * @return 删除结果
+ */
+ @PostMapping("/special/delete")
+ public R deleteSpecialInputUser(@RequestParam(value = "id") Long id){
+ return comMngPopulationService.deleteSpecialInputUser(id);
+ }
}
--
Gitblit v1.7.1