Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

101captain

2021-09-22 1775bb71f952106c58657cf02891cbe2a286c8f8

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

@@ -500,10 +500,40 @@
     * @return 导入结果
     */
    @Transactional(rollbackFor = Exception.class)
    @PostMapping("/population/importLowSecurity")
    @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);
    }

    /**
@@ -530,8 +560,8 @@
     * @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);
    }

    /**