From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
index f204673..15dc7bc 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/InsReportController.java
+++ b/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));
}
/**
--
Gitblit v1.9.3