From 09e41d546b030b47661877d4b8141c88584d7598 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 24 九月 2021 16:03:52 +0800
Subject: [PATCH] Merge branch 'test' into 'four_member'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 0f1bcca..1ad6f35 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
@@ -500,10 +500,40 @@
* @return 导入结果
*/
@Transactional(rollbackFor = Exception.class)
- @PostMapping("/population/importLowSecurity")
+ @PostMapping("population/importLowSecurity")
public R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
@RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
return comMngPopulationService.listSaveLowSecurityPopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入高龄老人 listSavePopulationElderExcelVO 批量导入高龄老人
+ * @param list 高龄老人数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importElder")
+ public R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+ return comMngPopulationService.listSaveEdlerPopulation(list, communityId, userId);
+ }
+
+ /**
+ * 批量导入养老金人员 listSavePopulationPensionExcelVO 批量导入养老金人员
+ * @param list 养老金人员数据
+ * @param communityId 社区id
+ * @return R 导入结果
+ * @author txb
+ * @date 2021/9/01 15:03
+ */
+ @Transactional(rollbackFor = Exception.class)
+ @PostMapping("population/importPension")
+ R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
+ @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
+ return comMngPopulationService.listSavePensionPopulation(list, communityId, userId);
}
/**
@@ -530,8 +560,8 @@
* @return 实有人口详情查询结果
*/
@PostMapping("/population/detail")
- public R detailPopulation(@RequestParam(value = "populationId") Long populationId) {
- return comMngPopulationService.detailPopulation(populationId);
+ public R detailPopulation(@RequestParam(value = "populationId") Long populationId, @RequestParam(value = "communityId") Long communityId) {
+ return comMngPopulationService.detailPopulation(populationId, communityId);
}
/**
@@ -721,6 +751,17 @@
public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
return comMngPopulationHouseService.getCascadeHouseAddress(cascadeHouseDTO);
}
+ /**
+ * 查询房屋二级级联菜单
+ *
+ * @param cascadeHouseDTO
+ * 请求参数
+ * @return 菜单列表
+ */
+ @PostMapping("/population/second/list")
+ public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
+ return comMngPopulationHouseService.getSecondHouseAddress(cascadeHouseDTO);
+ }
/**
* 分页查询房屋列表
@@ -805,5 +846,4 @@
public R villageStatistics(@RequestParam("communityId") Long communityId) {
return comMngVillageService.villageStatistics(communityId);
}
-
}
--
Gitblit v1.7.1