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

huanghongfa

2021-08-06 add39a5a140ca34752dc8f91a1b7f8f3b8185b72

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

@@ -382,6 +382,45 @@
    }

    /**
     * 批量导入刑释人员
     *
     * @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){
        return comMngPopulationService.listSaveRehabilitationPopulation(list, communityId);
    }

    /**
     * 批量导入重点上访人员
     *
     * @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){
        return comMngPopulationService.listSaveKeyPopulation(list, communityId);
    }

    /**
     * 批量导入服刑人员
     *
     * @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){
        return comMngPopulationService.listSaveSentencePopulation(list, communityId);
    }

    /**
     * 确认导入实有人口（有则更新，无则新建）
     *
     * @param list        用户信息