Merge branch 'lyq' into 'test'

罗元桥

2021-05-25 b24f9c75c79e4de248505295bfea7055e4975ff4

 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);
}