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/api/CommonDataApi.java

@@ -4,6 +4,7 @@
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.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;
@@ -112,6 +113,17 @@
    }

    /**
     * 车辆导出
     *
     * @param exportComMngCarExcelDTO
     * @return
     */
    @PostMapping("/car/export")
    public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO){
        return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
    }

    /**
     * 社区后台实有单位管理列表
     *
     * @param pageComMngRealCompanyDTO
@@ -120,6 +132,17 @@
    @PostMapping("/company/page")
    public R pageQueryComMngRealCompany(@RequestBody PageComMngRealCompanyDTO pageComMngRealCompanyDTO) {
        return comMngRealCompanyService.pageQueryComMngRealCompany(pageComMngRealCompanyDTO);
    }

    /**
     * 社区后台实有单位统计
     *
     * @param communityId 社区id
     * @return 统计结果
     */
    @PostMapping("/company/statistics")
    public R getComMngRealCompanyTotalByAdmin(@RequestParam("communityId") Long communityId){
        return comMngRealCompanyService.getComMngRealCompanyTotalByAdmin(communityId);
    }

    /**
@@ -398,6 +421,17 @@
    }

    /**
     * 根据小区id查询实有人口
     *
     * @param villageId 小区id
     * @return 查询结果
     */
    @PostMapping("/population/getListByVillageId")
    R getPopulationListByVillageId(@RequestParam(value = "villageId") Long villageId){
        return comMngPopulationService.getPopulationListByVillageId(villageId);
    }

    /**
     * 编辑实有人口
     *
     * @param populationEditDTO
@@ -431,6 +465,36 @@
    }

    /**
     * 基础数据》特殊群体》分页查询标签列表
     * @param comMngUserTagDTO
     * @return
     */
    @PostMapping("/special/tags/page")
    public R specialInputUserTags(@RequestBody PageInputUserDTO comMngUserTagDTO){
        return comMngPopulationService.specialInputUserTags(comMngUserTagDTO);
    }

    /**
     * 新增或修改特殊群体标签
     * @param comMngTagVO
     * @return
     */
    @PostMapping("/special/tags/save")
    public R saveSpecialInputUserTags(@RequestBody ComMngTagVO comMngTagVO){
        return comMngPopulationService.saveSpecialInputUserTags(comMngTagVO);
    }

    /**
     * 删除特殊群体标签
     * @param id
     * @return
     */
    @PostMapping("/special/tags/delete")
    public R deleteSpecialInputUserTags(@RequestParam(value = "id") Long id){
        return comMngPopulationService.deleteSpecialInputUserTags(id);
    }

    /**
     * 编辑实有人口_电子档案
     *
     * @param userElectronicFileVO