From a64bcc9be2f4e6e84bcdf92c1805124d91aa3cf5 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 02 八月 2021 18:28:43 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 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 29723dd..f8b662a 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
@@ -4,6 +4,7 @@
import com.panzhihua.common.model.dtos.community.ComMngPopulationEditDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDTO;
import com.panzhihua.common.model.dtos.community.bigscreen.BigScreenEventDetailDTO;
import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.PageComMngPopulationDTO;
@@ -17,8 +18,13 @@
import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
+import com.panzhihua.common.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -74,7 +80,7 @@
* @param communityId
* @return
*/
- R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception;
+ R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId);
/**
* 确认导入实有人口（有则更新，无则新建）
@@ -117,6 +123,14 @@
R getPopulationLists(List<Long> Ids);
/**
+ * 根据小区id查询实有人口
+ *
+ * @param villageId 小区id
+ * @return 查询结果
+ */
+ R getPopulationListByVillageId(Long villageId);
+
+ /**
* 编辑实有人口
*
* @param populationEditDTO
@@ -140,6 +154,27 @@
* @return 删除结果
*/
R deleteSpecialInputUser(Long id);
+
+ /**
+ * 基础数据》特殊群体》分页查询标签列表
+ * @param comMngUserTagDTO
+ * @return
+ */
+ R specialInputUserTags(PageInputUserDTO comMngUserTagDTO);
+
+ /**
+ * 新增或修改特殊群体标签
+ * @param comMngTagVO
+ * @return
+ */
+ R saveSpecialInputUserTags(ComMngTagVO comMngTagVO);
+
+ /**
+ * 删除特殊群体标签
+ * @param id
+ * @return
+ */
+ R deleteSpecialInputUserTags(Long id);
/**
* 查询实有人口电子档信息
@@ -172,10 +207,10 @@
/**
* 事件大屏统计接口
- * @param communityId 社区id
+ * @param screenEventDTO 请求参数
* @return 统计结果
*/
- R getScreenEvent(Long communityId);
+ R getScreenEvent(BigScreenEventDTO screenEventDTO);
/**
* 民生大屏统计接口
--
Gitblit v1.7.1