From fe14e53fde451c5435aa866969a5f0811cef83cd Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期六, 15 一月 2022 16:22:47 +0800
Subject: [PATCH] Merge branch 'renhequ' into dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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..b963baa 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.*;
@@ -332,6 +333,18 @@
@PostMapping("/population/page")
public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
return comMngPopulationService.pagePopulation(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 +688,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);
+ }
/**
* 删除特殊群体人员
--
Gitblit v1.7.1