From 7ee17a00bd47309ea1a61e28f2e44f621a01b8cd Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 27 四月 2022 11:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng' into huacheng
---
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 b963baa..c22cdd6 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
@@ -334,6 +334,17 @@
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);
+ }
/**
* 根据身份证查询实有人口信息
@@ -946,4 +957,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