不合格管理：重新提交oa功能调整

zouyu

2026-01-29 68d6ddbe1610b66e75ee05ad75998ce1a3caadba

 inspect-server/src/main/java/com/ruoyi/inspect/controller/InsUnqualifiedHandlerController.java

@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.oa.OAProcess;
import com.ruoyi.inspect.dto.PushOADto;
@@ -59,12 +60,13 @@
    }


    @Anonymous
    @ApiOperation(value = "不合格处理OA回调")
    @RequestMapping(value = "/callback", produces = "text/plain")
    public String unqualifiedHandlerOACallback(String data){
        String msg = OAProcess.oaReturnMsg(0, "success");
        JSONObject json = JSONObject.parseObject(data);
        System.out.println("========>" + json);
        log.info("oa回调参数========>" + json);
        try {
            Long oaWorkId = json.getLong(REQUESTID);
            String checkResult = json.getString(CHECKRESULT);
@@ -72,10 +74,10 @@
            JSONArray objects = JSONArray.parseArray(JSONObject.toJSONString(o));
            unqualifiedHandlerService.unqualifiedHandlerOACallback(oaWorkId, checkResult,objects);
        } catch (Exception e) {
            System.out.println(e.getMessage());
            log.error("oa回调失败: " + e.getMessage());
            msg = OAProcess.oaReturnMsg(1, "oa回调失败: " + e.getMessage());
        }
        System.out.println("oa回调返回结果========>" + msg);
        log.info("oa回调返回结果========>" + msg);
        return msg;
    }

@@ -89,20 +91,17 @@
        unqualifiedHandlerFileService.downloadOAFile(handlerFileId,response);
    }


    @ApiOperation(value = "新增不合格处理")
    @PostMapping("/addUnqualifiedHandler")
    public Result addUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
        return Result.success(unqualifiedHandlerService.addUnqualifiedHandler(unqualifiedHandlerDto));
    }


    @ApiOperation(value = "编辑不合格处理")
    @PostMapping("/updateUnqualifiedHandler")
    @ApiOperation(value = "编辑不合格处理并且推送OA")
    @PostMapping("/reSubmitPushOa")
    public Result updateUnqualifiedHandler(@RequestBody UnqualifiedHandlerDto unqualifiedHandlerDto){
        return Result.success(unqualifiedHandlerService.updateUnqualifiedHandler(unqualifiedHandlerDto));
    }


    @ApiOperation(value = "查看oa流程")
    @GetMapping("/getOaFlow")
@@ -110,21 +109,17 @@
        return Result.success(unqualifiedHandlerService.getOaFlow(id));
    }



    @ApiOperation(value = "查看不合格处理界面")
    @GetMapping("/getUnqualifiedHandler")
    public Result getUnqualifiedHandler(Integer id){
        return Result.success(unqualifiedHandlerService.getUnqualifiedHandler(id));
    }


    @ApiOperation(value = "删除不合格处理")
    @DeleteMapping("/deleteUnqualifiedHandler")
    public Result deleteUnqualifiedHandler(Integer id) {
        return Result.success(unqualifiedHandlerService.deleteUnqualifiedHandler(id));
    }


    @ApiOperation(value = "下载附件")
    @GetMapping("/downFile")
@@ -136,4 +131,11 @@
        return Result.success(map);
    }

    @ApiOperation(value = "导出不合格处理记录")
    @GetMapping("/exportUnqualifiedHandler")
    public void exportUnqualifiedHandler(UnqualifiedHandlerDto unqualifiedHandlerDto,HttpServletResponse response) {
        unqualifiedHandlerService.exportUnqualifiedHandler(unqualifiedHandlerDto,response);
    }


}