From e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期一, 12 十月 2026 18:12:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
index 1b9e75e..8ec79c9 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/InsReportService.java
@@ -22,7 +22,7 @@
Map<String,Object> pageInsReport(Page page, ReportPageDto reportPageDto);
- void wordToPdf(String path,String sealUrl, boolean isRawMater);
+ void wordToPdf(String path, String maSealUrl, String seamSealUrl, boolean isRawMater);
int inReport(String url, Integer id);
@@ -35,7 +35,8 @@
int examineReport(Integer id, Integer isExamine, String examineTell, Integer userId);
//鎵瑰噯
- int ratifyReport(Integer id, Integer isRatify, String ratifyTell);
+ int ratifyReport(Integer id, Integer isRatify, String ratifyTell, String sealIds,
+ Integer maSealId, Integer reportSealId, Integer seamSealId);
int wordInsertUrl(Map<String, Object> map, String url);
--
Gitblit v1.9.3