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

zouyu

2026-01-30 5bd1e846de7587f39d3edacfed58bfa8325c8758

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

@@ -21,7 +21,6 @@

import javax.servlet.http.HttpServletResponse;
import java.util.HashMap;
import java.util.Map;

@RestController
@Api("不合格处理管理")
@@ -35,15 +34,11 @@
    private static final String REQUESTID = "requestId";
    private static final String CHECKRESULT = "CHECKRESULT";




    @ApiOperation(value = "提交OA")
    @PostMapping("/pushOA")
    public Result pushOA(@RequestBody PushOADto pushOADto){
        return unqualifiedHandlerService.pushOA(pushOADto);
    }


    @ApiOperation(value = "查询")
    @GetMapping("/page")
@@ -51,14 +46,11 @@
        return Result.success(unqualifiedHandlerService.pageList(page, unqualifiedHandlerDto));
    }



    @ApiOperation(value = "附件上传")
    @PostMapping("/uploadFileByUnqualified")
    public Result<?> uploadFileByUnqualified(Long handlerId, MultipartFile file) {
        return Result.success(unqualifiedHandlerFileService.uploadFile(handlerId, file));
    }


    @Anonymous
    @ApiOperation(value = "不合格处理OA回调")
@@ -66,7 +58,7 @@
    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);
@@ -77,7 +69,7 @@
            log.error("oa回调失败: " + e.getMessage());
            msg = OAProcess.oaReturnMsg(1, "oa回调失败: " + e.getMessage());
        }
        System.out.println("oa回调返回结果========>" + msg);
        log.info("oa回调返回结果========>" + msg);
        return msg;
    }

@@ -91,20 +83,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")
@@ -112,21 +101,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")
@@ -138,4 +123,11 @@
        return Result.success(map);
    }

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


}