Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 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;

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

    /**
     * 民生大屏统计接口