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

@@ -119,7 +119,7 @@
     * @return
     */
    @PostMapping("/car/export")
    public R exportRealCar(ExportComMngCarExcelDTO exportComMngCarExcelDTO){
    public R exportRealCar(@RequestBody ExportComMngCarExcelDTO exportComMngCarExcelDTO){
        return comMngCarService.exportRealCar(exportComMngCarExcelDTO);
    }

@@ -325,11 +325,102 @@
     */
    @PostMapping("/population/import")
    @Transactional(rollbackFor = Exception.class)
    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId) throws Exception {
    public R listSavePopulationExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId){
        return comMngPopulationService.listSavePopulation(list, communityId);
    }

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

    /**
     * 批量导入刑释人员
     *
     * @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        用户信息