From b24f9c75c79e4de248505295bfea7055e4975ff4 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 25 五月 2021 14:23:04 +0800
Subject: [PATCH] Merge branch 'lyq' into 'test'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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 f03054e..650d0e7 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
@@ -1,6 +1,7 @@
package com.panzhihua.service_community.service;
import com.panzhihua.common.model.dtos.community.ComMngPopulationDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
@@ -63,7 +64,7 @@
* @param communityId
* @return
*/
- R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId);
+ R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception;
/**
* 确认导入实有人口（有则更新，无则新建）
@@ -103,11 +104,11 @@
/**
* 编辑实有人口
- * @param editComMngPopulationVO
+ * @param populationEditDTO
* @param communityId
* @return
*/
- R editPopulation(EditComMngPopulationVO editComMngPopulationVO, Long communityId);
+ R editPopulation(ComMngPopulationEditDTO populationEditDTO, Long communityId) throws Exception;
/**
* 分页查询特殊群体
@@ -136,4 +137,11 @@
* @return
*/
R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO);
+
+ /**
+ * 实有人口统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ R getPopulationTotalByAdmin(Long communityId);
}
--
Gitblit v1.7.1