Merge remote-tracking branch 'origin/master'

吴羡

10 天以前 1c52e77d77d0e924a1df0725c0748afde172ad68

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

@@ -167,6 +167,14 @@
        insReportService.download(id, reportType, reportPageDto.getCreateOrderUser(), response);
    }

    @Operation(summary = "按 Word 原始分页排版预览报告 PDF")
    @GetMapping("/preview")
    @PreAuthorize("@ss.hasPermi('business:reportPreparation')")
    @PersonalScope(permsName = "business:reportPreparation", objectName = ReportPageDto.class, paramName = "createOrderUser")
    public void preview(Integer id, Integer reportType, ReportPageDto reportPageDto, HttpServletResponse response) {
        insReportService.preview(id, reportType, reportPageDto.getCreateOrderUser(), response);
    }

    @Operation(summary = "重新生成报告")
    @PostMapping("/regenerate")
//    @PreAuthorize("@ss.hasPermi('business:reportPreparation')")
@@ -182,16 +190,13 @@
        return Result.success(insReportService.upAll(file));
    }

    /**
     * 退回到检验任务
     * @param id
     * @return
     */
    @Operation(summary = "退回到检验任务")
    @Operation(summary = "退回到检验任务或报告审核")
    @PostMapping("/sendBackTask")
    public Result sendBackTask(@RequestBody Map<String, Object> param){
        Integer id = (Integer) param.get("id");
        return Result.success(insReportService.sendBackTask(id));
        Integer id = toInteger(param.get("id"));
        String target = param.get("target") == null ? null : String.valueOf(param.get("target"));
        String reason = param.get("reason") == null ? null : String.valueOf(param.get("reason"));
        return Result.success(insReportService.sendBackTask(id, target, reason));
    }

    /**