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

DESKTOP-71BH0QO\L、ming

2021-05-11 6d90aa0d86d4ef7d1eb4eda5dab1c10dc9e9df26

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java

@@ -1,9 +1,10 @@
package com.panzhihua.service_community.api;

import com.panzhihua.common.model.dtos.community.*;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.service_community.service.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -299,6 +300,17 @@
    }

    /**
     * 查询实有人口电子档信息
     * @param populationId  实有人口id
     * @return  实有人口电子档信息
     */
    @PostMapping("/population/electronicArchives")
    public R electronicArchivesPopulation(@RequestParam(value = "populationId") Long populationId) {
        return comMngPopulationService.electronicArchivesPopulation(populationId);
    }


    /**
     * 根据实有人口id修改标签列表
     * @param populationTagDTO 请求参数
     * @return  修改结果
@@ -313,7 +325,6 @@
     * @param Ids   删除id集合
     * @return  删除结果
     */
    @ApiOperation(value = "批量删除实有人口")
    @PostMapping("/population/delete")
    public R deletePopulations(@RequestBody List<Long> Ids) {
        return comMngPopulationService.deletePopulations(Ids);
@@ -324,7 +335,6 @@
     * @param communityId   社区id
     * @return  查询结果
     */
    @ApiOperation(value = "根据社区id查询所有实有人口")
    @PostMapping("/population/getAll")
    public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
        return comMngPopulationService.getPopulationListByCommunityId(communityId);
@@ -335,9 +345,49 @@
     * @param Ids   实有人口id集合
     * @return  查询结果
     */
    @ApiOperation(value = "批量删除实有人口")
    @PostMapping("/population/getList")
    public R getPopulationLists(@RequestBody List<Long> Ids) {
        return comMngPopulationService.getPopulationLists(Ids);
    }

    /**
     * 编辑实有人口
     * @param editComMngPopulationVO
     * @return
     */
    @PostMapping("/population/edit")
    R editPopulation(@RequestBody EditComMngPopulationVO editComMngPopulationVO,@RequestParam("communityId") Long communityId){
        return comMngPopulationService.editPopulation(editComMngPopulationVO, communityId);
    }

    /**
     * 分页查询特殊群体
     * @param pageInputUserDTO  请求参数
     * @return  特殊群体列表
     */
    @PostMapping("/special/page")
    public R specialInputUser(@RequestBody PageInputUserDTO pageInputUserDTO) {
        return comMngPopulationService.specialInputUser(pageInputUserDTO);
    }

    /**
     * 删除特殊群体人员
     * @param id    特殊群体id
     * @return  删除结果
     */
    @PostMapping("/special/delete")
    public R deleteSpecialInputUser(@RequestParam(value = "id") Long id){
        return comMngPopulationService.deleteSpecialInputUser(id);
    }

    /**
     * 编辑实有人口_电子档案
     * @param userElectronicFileVO
     * @return
     */
    @PostMapping("/population/edit/electronicArchives")
    R editPopulation(@RequestBody UserElectronicFileVO userElectronicFileVO){
        return comMngPopulationService.editUserElectronicFile(userElectronicFileVO);
    }

}