党建相关bug修改

101captain

2022-03-30 ed1eaf43a06591a3c8c74806eec00e1afc362543

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

@@ -1,20 +1,26 @@
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.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import java.util.List;

import javax.annotation.Resource;

import com.panzhihua.common.model.dtos.grid.AddComMngHousePopulationDTO;
import com.panzhihua.common.model.dtos.grid.DelComMngHousePopulationDTO;
import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;
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.model.vos.user.ComMngTagVO;
import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.service_community.service.*;

import lombok.extern.slf4j.Slf4j;

/**
 * @description: 社区管理/基础数据
@@ -41,10 +47,14 @@
    private ComMngPopulationService comMngPopulationService;
    @Resource
    private ComMngPopulationHouseService comMngPopulationHouseService;

    @Resource
    private ComMngVillageService comMngVillageService;
    @Resource
    private ComMngPopulationHouseUserService comMngPopulationHouseUserService;

    /**
     * 小程序用户车辆登记
     *
     * @param comCvtBusinessDTO
     * @return
     */
@@ -55,6 +65,7 @@

    /**
     * 小程序用户车辆列表
     *
     * @param userId
     * @return
     */
@@ -65,6 +76,7 @@

    /**
     * 社区后台车辆管理列表
     *
     * @param pageComMngCarDTO
     * @return
     */
@@ -75,16 +87,18 @@

    /**
     * 社区后台添加修改车辆
     *
     * @param comMngCarSaveDTO
     * @return
     */
    @PostMapping("/car/save")
    public R saveComMngCar(@Validated({AddGroup.class})  @RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
    public R saveComMngCar(@Validated({AddGroup.class}) @RequestBody ComMngCarSaveDTO comMngCarSaveDTO) {
        return comMngCarService.saveComMngCar(comMngCarSaveDTO);
    }

    /**
     * 社区后台删除车辆
     *
     * @param id
     * @return
     */
@@ -92,19 +106,36 @@
    public R deleteComMngCar(@RequestParam(value = "id") Long id) {
        return comMngCarService.deleteComMngCar(id);
    }

    /**
     * 社区后台导入车辆
     * @param list 车辆列表
     * @param communityId 社区编号
     *
     * @param list
     *            车辆列表
     * @param communityId
     *            社区编号
     * @return
     */
    @PostMapping("/car/import")
    public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list, @RequestParam("communityId") Long communityId){
        return comMngCarService.listSaveMngCarExcelVO(list,communityId);
    public R listSaveMngCarExcelVO(@RequestBody List<ComMngCarExcelVO> list,
        @RequestParam("communityId") Long communityId) {
        return comMngCarService.listSaveMngCarExcelVO(list, communityId);
    }

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

    /**
     * 社区后台实有单位管理列表
     *
     * @param pageComMngRealCompanyDTO
     * @return
     */
@@ -114,7 +145,20 @@
    }

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

    /**
     * 社区后台添加修改实有单位
     *
     * @param comMngRealCompanyVO
     * @return
     */
@@ -125,6 +169,7 @@

    /**
     * 社区后台删除实有单位
     *
     * @param id
     * @return
     */
@@ -142,30 +187,37 @@
    public R belongsComMngRealCompany(@RequestBody ComMngRealCompanyBelongsDTO comMngRealCompanyBelongsDTO) {
        return comMngRealCompanyService.belongsComMngRealCompany(comMngRealCompanyBelongsDTO);
    }

    /**
     * 社区后台导入实有单位
     * @param list 车实有单位列表
     * @param communityId 社区编号
     *
     * @param list
     *            车实有单位列表
     * @param communityId
     *            社区编号
     * @return
     */
    @PostMapping("/company/import")
    public R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list, @RequestParam("communityId") Long communityId){
        return comMngRealCompanyService.listSaveMngRealCompanyExcelVO(list,communityId);
    public R listSaveMngRealCompanyExcelVO(@RequestBody List<ComMngRealCompanyExcelVO> list,
        @RequestParam("communityId") Long communityId) {
        return comMngRealCompanyService.listSaveMngRealCompanyExcelVO(list, communityId);
    }

    /**
     * 导出实有单位
     * @param exportRealCompanyExcelDTO 实有单位导出查询参数
     *
     * @param exportRealCompanyExcelDTO
     *            实有单位导出查询参数
     * @return
     */
    @PostMapping("/company/export")
    public R exportRealCompanyExcel(@RequestBody ExportRealCompanyExcelDTO exportRealCompanyExcelDTO ){
    public R exportRealCompanyExcel(@RequestBody ExportRealCompanyExcelDTO exportRealCompanyExcelDTO) {
        return comMngRealCompanyService.exportRealCompanyExcel(exportRealCompanyExcelDTO);
    }


    /**
     * 社区后台实有资产管理列表
     *
     * @param pageComMngRealAssetsDTO
     * @return
     */
@@ -176,6 +228,7 @@

    /**
     * 社区后台添加修改实有资产
     *
     * @param comMngRealAssetsVO
     * @return
     */
@@ -186,6 +239,7 @@

    /**
     * 社区后台删除实有资产
     *
     * @param id
     * @return
     */
@@ -201,27 +255,34 @@

    /**
     * 社区后台导入实有资产
     * @param list 车实有资产列表
     * @param communityId 社区编号
     *
     * @param list
     *            车实有资产列表
     * @param communityId
     *            社区编号
     * @return
     */
    @PostMapping("/assets/import")
    public R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list, @RequestParam("communityId") Long communityId){
        return comMngRealAssetsService.listSaveMngRealAssetsExcelVO(list,communityId);
    public R listSaveMngRealAssetsExcelVO(@RequestBody List<ComMngRealAssetsExcelVO> list,
        @RequestParam("communityId") Long communityId) {
        return comMngRealAssetsService.listSaveMngRealAssetsExcelVO(list, communityId);
    }

    /**
     * 导出实有资产
     * @param exportRealAssetsExcelDTO 实有资产导出查询参数
     *
     * @param exportRealAssetsExcelDTO
     *            实有资产导出查询参数
     * @return
     */
    @PostMapping("/assets/export")
    public R exportRealAssetsExcel(@RequestBody ExportRealAssetsExcelDTO exportRealAssetsExcelDTO ){
    public R exportRealAssetsExcel(@RequestBody ExportRealAssetsExcelDTO exportRealAssetsExcelDTO) {
        return comMngRealAssetsService.exportRealAssetsExcel(exportRealAssetsExcelDTO);
    }

    /**
     * 查询所有省份
     *
     * @return
     */
    @GetMapping("/province")
@@ -231,93 +292,324 @@

    /**
     * 查询省份下所有的城市
     *
     * @param provinceAdcode
     * @return
     */
    @GetMapping("/city")
    public R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){
    public R getCityByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return comMngProvinceService.getCityByProvinceCode(provinceAdcode);
    }

    /**
     * 查询城市下所有的区县
     *
     * @param cityAdcode
     * @return
     */
    @GetMapping("/district")
    R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode){
    R getDistrictByCityCode(@RequestParam(value = "cityAdcode") Integer cityAdcode) {
        return comMngProvinceService.getDistrictByCityCode(cityAdcode);
    }

    /**
     * 查询特定省下所有区域 tree结构
     *
     * @param provinceAdcode
     * @return
     */
    @GetMapping("/area/all")
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode){
    R getCityTreeByProvinceCode(@RequestParam(value = "provinceAdcode") Integer provinceAdcode) {
        return comMngProvinceService.getCityTreeByProvinceCode(provinceAdcode);
    }

    /**
     * 社区后台实有人口管理列表
     * @param comMngPopulationVO 查询参数
     * @return  实有人口分页查询结果
     *
     * @param comMngPopulationVO
     *            查询参数
     * @return 实有人口分页查询结果
     */
    @PostMapping("/population/page")
    public R pagePopulation(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
        return comMngPopulationService.pagePopulation(comMngPopulationVO);
    }
    /**
     * 社区后台老人导出管理列表
     *
     * @param comMngPopulationVO
     *            查询参数
     * @return 实有人口分页查询结果
     */
    @PostMapping("/population/exportOld")
    public R exportOld(@RequestBody ComMngPopulationDTO comMngPopulationVO) {
        return comMngPopulationService.exportOld(comMngPopulationVO);
    }

    /**
     * 根据身份证查询实有人口信息
     */
    @GetMapping("/population/selectByIdCard")
    public R selectByIdCard(@RequestParam("idCard") String idCard){
        ComMngPopulationDO comMngPopulationDO=comMngPopulationService.getPopulationByCardNo(idCard);
        if(comMngPopulationDO!=null){
            return R.ok(comMngPopulationDO.getAddress());
        }
        return R.fail();
    }

    /**
     * 社区后台导入实有人口
     * @param list 数据
     * @param communityId 社区编号
     *
     * @param list
     *            数据
     * @param communityId
     *            社区编号
     * @return
     */
    @PostMapping("/population/import")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId)  throws Exception{
        return comMngPopulationService.listSavePopulation(list,communityId);
    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSavePopulation(list, communityId, userId);
    }

    /**
     * 批量导入吸毒人员
     *
     * @param list
     *            吸毒人员数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @PostMapping("population/importDrug")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationDrugExcelVO(@RequestBody List<ComMngPopulationDrugExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveDrugPopulation(list, communityId, userId);
    }

    /**
     * 批量导入社区矫正人员
     *
     * @param list
     *            社区矫正人员数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @PostMapping("population/importCorrect")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationCorrectExcelVO(@RequestBody List<ComMngPopulationCorrectExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveCorrectPopulation(list, communityId, userId);
    }

    /**
     * 批量导入重精人员
     *
     * @param list
     *            重精人员数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importMajor")
    public R listSavePopulationMajorExcelVO(@RequestBody List<ComMngPopulationMajorExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveMajorPopulation(list, communityId, userId);
    }

    /**
     * 批量导入邪教人员
     *
     * @param list
     *            邪教人员数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @PostMapping("population/importCult")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationCultExcelVO(@RequestBody List<ComMngPopulationCultExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveCultPopulation(list, communityId, userId);
    }

    /**
     * 批量导入刑释人员
     *
     * @param list
     *            刑释人员数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @PostMapping("population/importRehabilitation")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationRehabilitationExcelVO(@RequestBody List<ComMngPopulationRehabilitationExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId, userId);
    }

    /**
     * 批量导入重点上访人员
     *
     * @param list
     *            重点上访人员数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importKey")
    public R listSavePopulationKeyExcelVO(@RequestBody List<ComMngPopulationKeyExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveKeyPopulation(list, communityId, userId);
    }

    /**
     * 批量导入服刑人员
     *
     * @param list
     *            服刑人员数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importSentence")
    public R listSavePopulationSentenceExcelVO(@RequestBody List<ComMngPopulationSentenceExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveSentencePopulation(list, communityId, userId);
    }

    /**
     * 批量导入退役军人
     *
     * @param list
     *            退役军人数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importVeterans")
    public R listSavePopulationVeteransExcelVO(@RequestBody List<ComMngPopulationVeteransExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveVeteransPopulation(list, communityId, userId);
    }

    /**
     * 批量导入残疾人
     *
     * @param list
     *            残疾人数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importDisability")
    public R listSavePopulationDisabilityExcelVO(@RequestBody List<ComMngPopulationDisabilityExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveDisabilityPopulation(list, communityId, userId);
    }

    /**
     * 批量导入低保户
     *
     * @param list
     *            低保户数据
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importLowSecurity")
    public R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list,
        @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId) {
        return comMngPopulationService.listSaveLowSecurityPopulation(list, communityId, userId);
    }

    /**
     * 批量导入高龄老人  listSavePopulationElderExcelVO  批量导入高龄老人
     * @param    list  高龄老人数据
     * @param    communityId   社区id
     * @return    R   导入结果
     * @author txb
     * @date 2021/9/01 15:03
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importElder")
    public R listSavePopulationElderExcelVO(@RequestBody List<ComMngPopulationElderExcelVO> list,
                                     @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
        return comMngPopulationService.listSaveEdlerPopulation(list, communityId, userId);
    }

    /**
     * 批量导入养老金人员  listSavePopulationPensionExcelVO  批量导入养老金人员
     * @param    list  养老金人员数据
     * @param    communityId   社区id
     * @return    R   导入结果
     * @author txb
     * @date 2021/9/01 15:03
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("population/importPension")
    R listSavePopulationPensionExcelVO(@RequestBody List<ComMngPopulationPensionExcelVO> list,
                                       @RequestParam(value = "communityId") Long communityId, @RequestParam(value = "userId") Long userId){
        return comMngPopulationService.listSavePensionPopulation(list, communityId, userId);
    }

    /**
     * 确认导入实有人口（有则更新，无则新建）
     * @param list  用户信息
     * @param communityId   社区id
     * @return  导入结果
     *
     * @param list
     *            用户信息
     * @param communityId
     *            社区id
     * @return 导入结果
     */
    @PostMapping("/population/import/confirm")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
        return comMngPopulationService.listSavePopulationConfirm(list,communityId);
    public R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list,
        @RequestParam(value = "communityId") Long communityId) {
        return comMngPopulationService.listSavePopulationConfirm(list, communityId);
    }

    /**
     * 根据实有人口id查询详情
     * @param populationId 实有人口id
     * @return  实有人口详情查询结果
     *
     * @param populationId
     *            实有人口id
     * @return 实有人口详情查询结果
     */
    @PostMapping("/population/detail")
    public R detailPopulation(@RequestParam(value = "populationId") Long populationId) {
        return comMngPopulationService.detailPopulation(populationId);
    public R detailPopulation(@RequestParam(value = "populationId") Long populationId, @RequestParam(value = "communityId") Long communityId) {
        return comMngPopulationService.detailPopulation(populationId, communityId);
    }

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


    /**
     * 根据实有人口id修改标签列表
     * @param populationTagDTO 请求参数
     * @return  修改结果
     *
     * @param populationTagDTO
     *            请求参数
     * @return 修改结果
     */
    @PostMapping("/population/editTag")
    public R editTagPopulation(@RequestBody ComMngPopulationTagDTO populationTagDTO) {
@@ -325,19 +617,35 @@
    }

    /**
     * 根据实有人口身份证修改标签列表
     *
     * @param comMngPopulationTagCardNoDTO
     *            请求参数
     * @return 修改结果
     */
    @PostMapping("/cardNo/population/editTag")
    public R editTagPopulationByCardNo(@RequestBody ComMngPopulationTagCardNoDTO comMngPopulationTagCardNoDTO) {
        return comMngPopulationService.editTagPopulationByCardNo(comMngPopulationTagCardNoDTO);
    }

    /**
     * 批量删除实有人口
     * @param Ids   删除id集合
     * @return  删除结果
     *
     * @param ids
     *            删除id集合
     * @return 删除结果
     */
    @PostMapping("/population/delete")
    public R deletePopulations(@RequestBody List<Long> Ids) {
        return comMngPopulationService.deletePopulations(Ids);
    public R deletePopulations(@RequestBody List<Long> ids, Long communityId) {
        return comMngPopulationService.deletePopulations(ids,communityId);
    }

    /**
     * 根据社区id查询所有实有人口
     * @param communityId   社区id
     * @return  查询结果
     *
     * @param communityId
     *            社区id
     * @return 查询结果
     */
    @PostMapping("/population/getAll")
    public R getPopulationListByCommunityId(@RequestParam(value = "communityId") Long communityId) {
@@ -346,8 +654,10 @@

    /**
     * 根据id集合查询实有人口
     * @param Ids   实有人口id集合
     * @return  查询结果
     *
     * @param Ids
     *            实有人口id集合
     * @return 查询结果
     */
    @PostMapping("/population/getList")
    public R getPopulationLists(@RequestBody List<Long> Ids) {
@@ -355,63 +665,309 @@
    }

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

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

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

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

    /**
     * 基础数据》特殊群体》分页查询标签列表
     * 
     * @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
     * @return
     */
    @PostMapping("/population/edit/electronicArchives")
    R editPopulation(@RequestBody UserElectronicFileVO userElectronicFileVO){
    R editPopulation(@RequestBody UserElectronicFileVO userElectronicFileVO) {
        return comMngPopulationService.editUserElectronicFile(userElectronicFileVO);
    }

    /**
     * 实有人口统计
     * @param communityId   社区id
     * @return  统计结果
     *
     * @param communityId
     *            社区id
     * @return 统计结果
     */
    @PostMapping("/population/Statistics")
    @PostMapping("/population/statistics")
    public R getPopulationTotalByAdmin(@RequestParam("communityId") Long communityId) {
        return comMngPopulationService.getPopulationTotalByAdmin(communityId);
    }

    /**
     * 查询房屋级联菜单
     * @param cascadeHouseDTO   请求参数
     * @return  菜单列表
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/population/cascade/list")
    public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO){
    public R getCascadeHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        return comMngPopulationHouseService.getCascadeHouseAddress(cascadeHouseDTO);
    }
    /**
     * 查询房屋二级级联菜单
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/population/second/list")
    public R getSecondHouseAddress(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        return comMngPopulationHouseService.getSecondHouseAddress(cascadeHouseDTO);
    }

    /**
     * 查询房屋二级级联菜单后台
     *
     * @param cascadeHouseDTO
     *            请求参数
     * @return 菜单列表
     */
    @PostMapping("/population/second/listBack")
    public R getSecondHouse(@RequestBody CascadeHouseDTO cascadeHouseDTO) {
        return comMngPopulationHouseService.getSecondHouse(cascadeHouseDTO);
    }

    /**
     * 分页查询房屋列表
     *
     * @param populationHouseAdminDTO
     *            请求参数
     * @return 房屋列表
     */
    @PostMapping("/population/page/house")
    public R getPageHouse(@RequestBody ComMngPopulationHouseAdminDTO populationHouseAdminDTO) {
        return comMngPopulationHouseService.getPageHouse(populationHouseAdminDTO);
    }

    /**
     * 根据id查询实有房屋信息
     *
     * @param houseId
     *            房屋id
     * @return 房屋信息
     */
    @PostMapping("/population/house/detail")
    public R getHouseDetail(@RequestParam(value = "houseId") Long houseId) {
        return comMngPopulationHouseService.getHouseDetail(houseId);
    }

    /**
     * 编辑实有房屋信息
     *
     * @param houseEditAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/population/house/edit")
    public R editHouse(@RequestBody ComMngPopulationHouseEditAdminDTO houseEditAdminDTO) {
        return comMngPopulationHouseService.editHouse(houseEditAdminDTO);
    }

    /**
     * 新增实有房屋信息
     *
     * @param houseEditAdminDTO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/population/house/insert")
    public R insertHouse(@RequestBody ComMngPopulationHouseInsertAdminDTO houseEditAdminDTO) {
        return comMngPopulationHouseService.insertHouse(houseEditAdminDTO);
    }

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param Ids
     *            请求参数
     * @return 删除结果
     */
    @PostMapping("/population/house/delete")
    public R deleteHouses(@RequestBody List<Long> Ids) {
        return comMngPopulationHouseService.deleteHouses(Ids);
    }

    /**
     * 实有房屋统计
     *
     * @param communityId
     *            社区id
     * @return 统计结果
     */
    @PostMapping("/population/house/statistics")
    public R getHouseTotalByAdmin(@RequestParam("communityId") Long communityId) {
        return comMngPopulationHouseService.getHouseTotalByAdmin(communityId);
    }

    /**
     * 根据社区id查询社区所有省市区
     *
     * @param communityId
     *            社区id
     * @return 社区所在省市区
     */
    @PostMapping("/village/getRegion")
    public R getRegion(@RequestParam("communityId") Long communityId) {
        return comMngPopulationHouseService.getRegion(communityId);
    }

    /**
     * 统计社区内小区数量
     *
     * @param communityId
     *            社区id
     * @return 统计小区数量
     */
    @PostMapping("/village/statistics")
    public R villageStatistics(@RequestParam("communityId") Long communityId) {
        return comMngVillageService.villageStatistics(communityId);
    }

    /**
     * 编辑实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/population/house/user/edit")
    public R editHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return comMngPopulationHouseUserService.updateAll(comMngPopulationHouseUserVO);
    }

    /**
     * 新增实有房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 编辑结果
     */
    @PostMapping("/population/house/user/insert")
    public R insertHouseUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return comMngPopulationHouseUserService.insert(comMngPopulationHouseUserVO);
    }

    /**
     * 根据房屋id列表删除房屋信息
     *
     * @param comMngPopulationHouseUserVO
     *            请求参数
     * @return 删除结果
     */
    @PostMapping("/population/house/user/delete")
    public R deleteHousesUser(@RequestBody ComMngPopulationHouseUserVO comMngPopulationHouseUserVO) {
        return comMngPopulationHouseUserService.delete(comMngPopulationHouseUserVO);
    }

    /**
     * 根据id查询
     *
     * @param id
     *            请求参数
     * @return 删除结果
     */
    @GetMapping("/population/house/user/detail")
    public R detailHousesUser(@RequestParam("id") Long id) {
        return comMngPopulationHouseUserService.detail(id);
    }

    /**
     * 历史数据人员类型填充
     * @param newVoList
     * @param communityId
     * @param userId
     * @return
     */
    @PostMapping("/history/filled")
    public R filledPopulationPersonType(@RequestBody List<ComMngPopulationServeExcelVO> newVoList,
                                 @RequestParam("communityId") Long communityId, @RequestParam("userId") Long userId) {
        return comMngPopulationService.filledPopulationPersonType(newVoList, communityId, userId);
    }
}