From da8cca4d320908b672f439369e65e9e6a95374e3 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 07 三月 2022 09:46:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/partyBuilding_lyq' into hemenkou_dev
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
index d8742d3..5c68b0b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java
@@ -74,6 +74,15 @@
R pagePopulation(ComMngPopulationDTO comMngPopulationVO);
/**
+ * 老人导出
+ *
+ * @param comMngPopulationVO
+ * 查询参数
+ * @return 分页集合
+ */
+ R exportOld(ComMngPopulationDTO comMngPopulationVO);
+
+ /**
* 查询平台所有的实有人口
*
* @return 实有人口集合 按照创建顺序倒序排列
@@ -538,4 +547,13 @@
* @return
*/
R indexInfo(Long communityId);
+
+ /**
+ * 历史数据人员类型填充
+ * @param newVoList
+ * @param communityId
+ * @param userId
+ * @return
+ */
+ R filledPopulationPersonType(List<ComMngPopulationServeExcelVO> newVoList, Long communityId, Long userId);
}
--
Gitblit v1.7.1