From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
index 48d4063..bfb7516 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsReportServiceImpl.java
@@ -46,6 +46,7 @@
import com.ruoyi.inspect.service.InsReportService;
import com.ruoyi.inspect.service.RawMaterialOrderService;
import com.ruoyi.inspect.util.PreserveReportPicturePlaceholderHandler;
+import com.ruoyi.inspect.util.ReportSignaturePictureUtils;
import com.ruoyi.system.mapper.UserMapper;
import com.ruoyi.system.service.InformationNotificationService;
import lombok.extern.slf4j.Slf4j;
@@ -228,9 +229,9 @@
}
Map<String, Object> writeMarks = new HashMap<String, Object>() {{
- put("writeUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+ put("writeUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
put("writeDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
- put("insUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+ put("insUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
}};
writeMarksToReportFiles(insReport, writeMarks);
@@ -335,7 +336,7 @@
informationNotificationService.addInformationNotification(info);
String primaryReportUrl = getPrimaryReportUrl(insReport);
Map<String, Object> examineMarks = new HashMap<String, Object>() {{
- put("examineUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+ put("examineUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
put("examineDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
}};
writeMarksToReportFiles(insReport, examineMarks);
@@ -478,7 +479,7 @@
String finalUrl = primaryReportUrl.replace("/word", wordUrl);
Map<String, Object> ratifyMarks = new HashMap<String, Object>() {{
- put("ratifyUrl", Pictures.ofLocal(imgUrl + "/" + signatureUrl).create());
+ put("ratifyUrl", ReportSignaturePictureUtils.create(imgUrl, signatureUrl));
put("ratifyDateUrl", Pictures.ofStream(DateImageUtil.createDateImage(null)).create());
put("seal1", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
put("seal2", Pictures.ofLocal(imgUrl + "/" + sealUrl).create());
--
Gitblit v1.9.3