From e75b4aa72e9f260912a96a9bc36b58f9985862b0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 30 六月 2021 18:13:15 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComMngPopulationService.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 173 insertions(+), 4 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 c376822..7cb19a0 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,11 +1,23 @@
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.ComMngPopulationTagCardNoDTO;
import com.panzhihua.common.model.dtos.community.ComMngPopulationTagDTO;
+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;
+import com.panzhihua.common.model.dtos.grid.PagePopulationListDTO;
+import com.panzhihua.common.model.dtos.grid.admin.ComMngPopulationListDTO;
+import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngPopulationServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
+import com.panzhihua.common.model.vos.community.EditComMngPopulationVO;
+import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
+
+import java.util.List;
/**
* 实有人口Service
@@ -52,10 +64,167 @@
* @return 删除结果
*/
R deletePopulation(Long populationId);
+
+ /**
+ * 导入实有人口
+ * @param list
+ * @param communityId
+ * @return
+ */
+ R listSavePopulation(List<ComMngPopulationServeExcelVO> list, Long communityId) throws Exception;
+
+ /**
+ * 确认导入实有人口（有则更新，无则新建）
+ *
+ * @param list 用户信息
+ * @param communityId 社区id
+ * @return 导入结果
+ */
+ R listSavePopulationConfirm(List<ComMngPopulationServeExcelVO> list, Long communityId);
/**
* 根据实有人口id修改用户标签
- * @param populationTagDTO 请求参数
- * @return 修改结果
+ *
+ * @param populationTagDTO 请求参数
+ * @return 修改结果
*/
R editTagPopulation(ComMngPopulationTagDTO populationTagDTO);
+
+ /**
+ * 批量删除实有人口
+ *
+ * @param Ids 实有人口id集合
+ * @return 删除结果
+ */
+ R deletePopulations(List<Long> Ids);
+
+ /**
+ * 根据社区id查询所有实有人口
+ *
+ * @param communityId 社区id
+ * @return 查询结果
+ */
+ R getPopulationListByCommunityId(Long communityId);
+
+ /**
+ * 根据id集合查询实有人口
+ *
+ * @param Ids 实有人口id集合
+ * @return 查询结果
+ */
+ R getPopulationLists(List<Long> Ids);
+
+ /**
+ * 编辑实有人口
+ *
+ * @param populationEditDTO
+ * @param communityId
+ * @return
+ */
+ R editPopulation(ComMngPopulationEditDTO populationEditDTO, Long communityId) throws Exception;
+
+ /**
+ * 分页查询特殊群体
+ *
+ * @param pageInputUserDTO 请求参数
+ * @return 特殊群体列表
+ */
+ R specialInputUser(PageInputUserDTO pageInputUserDTO);
+
+ /**
+ * 删除特殊群体人员
+ *
+ * @param id 特殊群体id
+ * @return 删除结果
+ */
+ R deleteSpecialInputUser(Long id);
+
+ /**
+ * 查询实有人口电子档信息
+ *
+ * @param populationId 实有人口id
+ * @return 实有人口电子档信息
+ */
+ R electronicArchivesPopulation(Long populationId);
+
+ /**
+ * 编辑电子档案
+ * @param userElectronicFileVO
+ * @return
+ */
+ R editUserElectronicFile(UserElectronicFileVO userElectronicFileVO);
+
+ /**
+ * 实有人口统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ R getPopulationTotalByAdmin(Long communityId);
+
+ /**
+ * 首页大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ R getScreenIndex(Long communityId);
+
+ /**
+ * 事件大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ R getScreenEvent(Long communityId);
+
+ /**
+ * 民生大屏统计接口
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ R getScreenCivil(Long communityId);
+
+ /**
+ * description 根据身份证信息修改用户标签信息
+ *
+ * @param comMngPopulationTagCardNoDTO 查询对象
+ * @return ComMngPopulationDO 实有人口信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ R editTagPopulationByCardNo(ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO);
+
+ /**
+ * description 根据身份证信息从实有人口表查询对应信息
+ *
+ * @param cardNo 身份证号码
+ * @return ComMngPopulationDO 实有人口信息
+ * @author manailin
+ * @date 2021/6/10 17:00
+ */
+ ComMngPopulationDO getPopulationByCardNo(String cardNo);
+
+ /**
+ * 大屏统计实有人口
+ * @param communityId
+ * @return
+ */
+ R screenStatistic(Long communityId);
+
+ R getScreenGirds(Long communityId);
+
+ R getScreenEventDetail(BigScreenEventDetailDTO eventDetailDTO);
+
+ R pagePopulationListApp(PagePopulationListDTO populationListDTO);
+
+ R getPopulationDetailApp(Long populationId);
+
+ R getPopulationRepairByApp();
+
+ R getGridPopulationAdminList(ComMngPopulationListDTO populationListDTO);
+
+ R delGridPopulationAdmin(List<Long> ids);
+
+ R getBuildingHousePopulationList(PageComMngPopulationDTO populationDTO);
+
+
+
+ R binding();
}
--
Gitblit v1.7.1