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

huanghongfa

2021-08-04 e70053d772947e6e50cfa42f5a544a009699c4ac

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

@@ -330,6 +330,45 @@
    }

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

    /**
     * 批量导入社区矫正人员
     *
     * @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){
        return comMngPopulationService.listSaveCorrectPopulation(list, communityId);
    }

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

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