From 5dc04f3291c00d66f8733a49896612ea1e3b31c5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 16 九月 2021 13:19:14 +0800
Subject: [PATCH] Merge branch 'test' into 'zzj'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 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 d572123..45a404c 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);
}
/**
--
Gitblit v1.7.1