事故管理删除接口fix

songhuangfeng123

2022-08-02 40945d0f14e4d721e9e9800a55a2d94930a34729

事故管理删除接口fix

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentExpressController.java

@@ -61,8 +61,8 @@
    /**
     * 事故快报删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteAccidentExpress(@PathVariable("ids")String ids){
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteAccidentExpress(@RequestBody Long[] ids){
        return accidentExpressService.batchDeleteAccidentExpress(ids);
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/AccidentReportController.java

@@ -60,8 +60,8 @@
    /**
     * 事故报告删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteAccidentReport(@PathVariable("ids")String ids){
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteAccidentReport(@RequestBody Long[] ids){
        return accidentReportService.batchDeleteAccidentReport(ids);
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/controller/WorkInjuryDeclarationController.java

@@ -23,7 +23,7 @@
    private WorkInjuryDeclarationService workInjuryDeclarationService;

    /**
     * 工商报告列表
     * 工伤报告列表
     */
    @RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
    private ResultVO<List<WorkInjuryDeclarationPageRespDTO>> list (@RequestBody PageQuery<WorkInjuryDeclarationQuery> pageQuery){
@@ -32,16 +32,16 @@
    }

    /**
     * 工商报告新增
     * 工伤报告新增
     */
    @RequestMapping(value = "/add",method = RequestMethod.POST)
    public ResultVO addworkInjuryDeclaration(Authentication authentication, @RequestBody WorkInjuryDeclarationReqDTO workInjuryDeclarationReqDTO) {
    public ResultVO addWorkInjuryDeclaration(Authentication authentication, @RequestBody WorkInjuryDeclarationReqDTO workInjuryDeclarationReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return workInjuryDeclarationService.addWorkInjuryDeclaration(currentUser.getUid(), workInjuryDeclarationReqDTO);
    }

    /**
     * 工商报告详情
     * 工伤报告详情
     */
    @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
    public ResultVO<WorkInjuryDeclarationDetailRespDTO> getworkInjuryDeclarationById(@PathVariable("id")Long id){
@@ -49,19 +49,19 @@
    }

    /**
     * 工商报告修改
     * 工伤报告修改
     */
    @RequestMapping(value = "/update",method = RequestMethod.POST)
    public ResultVO updateworkInjuryDeclaration(Authentication authentication, @RequestBody WorkInjuryDeclarationReqDTO workInjuryDeclarationReqDTO) {
    public ResultVO updateWorkInjuryDeclaration(Authentication authentication, @RequestBody WorkInjuryDeclarationReqDTO workInjuryDeclarationReqDTO) {
        ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
        return workInjuryDeclarationService.updateWorkInjuryDeclaration(currentUser.getUid(), workInjuryDeclarationReqDTO);
    }

    /**
     * 工商报告删除/批量删除
     * 工伤报告删除/批量删除
     */
    @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
    public ResultVO batchDeleteworkInjuryDeclaration(@PathVariable("ids")String ids){
    @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
    public ResultVO batchDeleteWorkInjuryDeclaration(@RequestBody Long[] ids){
        return workInjuryDeclarationService.batchDeleteWorkInjuryDeclaration(ids);
    }


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentExpressService.java

@@ -22,7 +22,7 @@

    ResultVO updateAccidentExpress(Long uid, AccidentExpressReqDTO AccidentExpressReqDTO);

    ResultVO batchDeleteAccidentExpress(String ids);
    ResultVO batchDeleteAccidentExpress(Long[] ids);

    ResultVO selectAccidentExpressCasualtyList(Long accidentExpressId);


 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/AccidentReportService.java

@@ -20,5 +20,5 @@

    ResultVO updateAccidentReport(Long uid, AccidentReportReqDTO AccidentReportReqDTO);

    ResultVO batchDeleteAccidentReport(String ids);
    ResultVO batchDeleteAccidentReport(Long[] ids);
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/WorkInjuryDeclarationService.java

@@ -20,5 +20,5 @@

    ResultVO updateWorkInjuryDeclaration(Long uid, WorkInjuryDeclarationReqDTO WorkInjuryDeclarationReqDTO);

    ResultVO batchDeleteWorkInjuryDeclaration(String ids);
    ResultVO batchDeleteWorkInjuryDeclaration(Long[] ids);
}

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentExpressServiceImpl.java

@@ -211,13 +211,12 @@


    @Override
    public ResultVO batchDeleteAccidentExpress(String ids) {
        if (StringUtils.isBlank(ids)){
    public ResultVO batchDeleteAccidentExpress(Long[] ids) {
        if (ids == null ||  ids.length==0){
            throw new AccidentException(AccidentResultCodes.ACCIDENT_EXPRESS_NULL);
        }else{
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteAccidentExpress(Long.valueOf(id));
            for (Long id : ids){
                deleteAccidentExpress(id);
            }
            return new ResultVO(ResultCodes.OK);
        }

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/AccidentReportServiceImpl.java

@@ -208,13 +208,13 @@


    @Override
    public ResultVO batchDeleteAccidentReport(String ids) {
        if (StringUtils.isBlank(ids)) {
    public ResultVO batchDeleteAccidentReport(Long[] ids) {
        if (ids == null ||  ids.length==0){
            throw new AccidentException(AccidentResultCodes.ACCIDENT_REPORT_NULL);
        } else {
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteAccidentReport(Long.valueOf(id));

            for (Long id : ids){
                deleteAccidentReport(id);
            }
            return new ResultVO(ResultCodes.OK);
        }

 incident-manage/incident-manage-service/src/main/java/com/gkhy/safePlatform/incidentManage/service/impl/WorkInjuryDeclarationServiceImpl.java

@@ -207,13 +207,13 @@


    @Override
    public ResultVO batchDeleteWorkInjuryDeclaration(String ids) {
        if (StringUtils.isBlank(ids)){
    public ResultVO batchDeleteWorkInjuryDeclaration(Long[] ids) {

        if (ids == null ||  ids.length==0){
            throw new AccidentException(AccidentResultCodes.WORK_INJURY_DECLARATION_NULL);
        }else{
            String[] idArr = ids.split(",");
            for (String id : idArr) {
                deleteWorkInjuryDeclaration(Long.valueOf(id));
            for (Long id : ids){
                deleteWorkInjuryDeclaration(id);
            }
            return new ResultVO(ResultCodes.OK);
        }