From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 32b0084..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.*;
@@ -335,6 +336,18 @@
}
/**
+ * 根据身份证查询实有人口信息
+ */
+ @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();
+ }
+
+ /**
* 社区后台导入实有人口
*
* @param list
@@ -607,13 +620,13 @@
/**
* 批量删除实有人口
*
- * @param Ids
+ * @param ids
* 删除id集合
* @return 删除结果
*/
@PostMapping("/population/delete")
- public R deletePopulations(@RequestBody List<Long> Ids) {
- return comMngPopulationService.deletePopulations(Ids);
+ public R deletePopulations(@RequestBody List<Long> ids, Long communityId) {
+ return comMngPopulationService.deletePopulations(ids,communityId);
}
/**
@@ -674,6 +687,17 @@
@PostMapping("/special/page")
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);
}
/**
@@ -768,6 +792,18 @@
}
/**
+ * 查询房屋二级级联菜单后台
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/population/second/listBack")
+ public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+ return comMngPopulationHouseService.getSecondHouse(cascadeHouseDTO);
+ }
+
+ /**
* 分页查询房屋列表
*
* @param populationHouseAdminDTO
--
Gitblit v1.7.1