From 570e138a15bb830d5c1ce928181415effbbef4ec Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 20 五月 2021 10:55:36 +0800
Subject: [PATCH] bugfixed
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 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..743a5d4 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,13 +1,16 @@
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.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -74,7 +77,7 @@
* @return
*/
@PostMapping("/car/save")
- public R saveComMngCar(@RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
+ public R saveComMngCar(@Validated({AddGroup.class}) @RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
return comMngCarService.saveComMngCar(comMngCarSaveDTO);
}
@@ -299,6 +302,17 @@
}
/**
+ * 查询实有人口电子档信息
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ @PostMapping("/population/electronicArchives")
+ public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
+ return comMngPopulationService.electronicArchivesPopulation(populationId);
+ }
+
+
+ /**
* 根据实有人口id修改标签列表
* @param populationTagDTO 请求参数
* @return 修改结果
@@ -313,7 +327,6 @@
* @param Ids 删除id集合
* @return 删除结果
*/
- @ApiOperation(value = "批量删除实有人口")
@PostMapping("/population/delete")
public R deletePopulations(@RequestBody List<Long> Ids) {
return comMngPopulationService.deletePopulations(Ids);
@@ -324,7 +337,6 @@
* @param communityId 社区id
* @return 查询结果
*/
- @ApiOperation(value = "根据社区id查询所有实有人口")
@PostMapping("/population/getAll")
public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
return comMngPopulationService.getPopulationListByCommunityId(communityId);
@@ -335,9 +347,49 @@
* @param Ids 实有人口id集合
* @return 查询结果
*/
- @ApiOperation(value = "批量删除实有人口")
@PostMapping("/population/getList")
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);
+ }
+
+ /**
+ * 编辑实有人口_电子档案
+ * @param userElectronicFileVO
+ * @return
+ */
+ @PostMapping("/population/edit/electronicArchives")
+ R editPopulation(@RequestBody UserElectronicFileVO userElectronicFileVO){
+ return comMngPopulationService.editUserElectronicFile(userElectronicFileVO);
+ }
+
}
--
Gitblit v1.7.1