From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:05:28 +0800
Subject: [PATCH] 三说会堂事件流程处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 51 insertions(+), 2 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 fb97e74..cad5227 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
@@ -6,6 +6,7 @@
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -318,8 +319,9 @@
* @return
*/
@GetMapping("/area/all")
- R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
- return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
+ public R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode,
+ @RequestParam(value = "areaCode", required = false) String areaCode) {
+ return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode, areaCode);
}
/**
@@ -332,6 +334,29 @@
@PostMapping("/population/page")
public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
return comMngPopulationService.pagePopulation(comMngPopulationVO);
+ }
+ /**
+ * 社区后台老人导出管理列表
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 实有人口分页查询结果
+ */
+ @PostMapping("/population/exportOld")
+ public R exportOld(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
+ return comMngPopulationService.exportOld(comMngPopulationVO);
+ }
+
+ /**
+ * 根据身份证查询实有人口信息
+ */
+ @GetMapping("/population/selectByIdCard")
+ public R selectByIdCard(@RequestParam("idCard") String idCard){
+ ComMngPopulationDO comMngPopulationDO=comMngPopulationService.getPopulationByCardNo(idCard);
+ if(comMngPopulationDO!=null){
+ return R.ok(comMngPopulationDO.getAddress());
+ }
+ return R.fail();
}
/**
@@ -675,6 +700,17 @@
public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
return comMngPopulationService.specialInputUser(pageInputUserDTO);
}
+ /**
+ * 导出特殊群体
+ *
+ * @param pageInputUserDTO
+ * 请求参数
+ * @return 特殊群体列表
+ */
+ @PostMapping("/special/export")
+ public R specialInputUserExport(@RequestBody PageInputUserDTO pageInputUserDTO) {
+ return comMngPopulationService.specialInputUserExport(pageInputUserDTO);
+ }
/**
* 删除特殊群体人员
@@ -922,4 +958,17 @@
public R detailHousesUser(@RequestParam("id") Long id) {
return comMngPopulationHouseUserService.detail(id);
}
+
+ /**
+ * 历史数据人员类型填充
+ * @param newVoList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ @PostMapping("/history/filled")
+ public R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
+ @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
+ return comMngPopulationService.filledPopulationPersonType(newVoList, communityId, userId);
+ }
}
--
Gitblit v1.7.1