From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB,请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑,报告中仅显示温度信息 - 新增印章管理功能,支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程,增加多种报告类型常量定义 - 优化附件上传功能,增加空值检查和返回值处理 - 调整委托编号生成逻辑,完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java b/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java
index 9fb72f7..14b801c 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/util/PreserveReportPicturePlaceholderHandler.java
@@ -5,6 +5,7 @@
import com.deepoove.poi.template.ElementTemplate;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -27,13 +28,23 @@
));
private final Configure.ClearHandler clearHandler = new Configure.ClearHandler();
+ private final Set<String> clearPictureTags;
+
+ public PreserveReportPicturePlaceholderHandler() {
+ this(Collections.emptySet());
+ }
+
+ public PreserveReportPicturePlaceholderHandler(Set<String> clearPictureTags) {
+ this.clearPictureTags = clearPictureTags == null ? Collections.emptySet() : clearPictureTags;
+ }
@Override
public void handler(RenderContext<?> context) {
ElementTemplate template = context.getEleTemplate();
if (template != null
&& Character.valueOf('@').equals(template.getSign())
- && DEFERRED_PICTURE_TAGS.contains(template.getTagName())) {
+ && DEFERRED_PICTURE_TAGS.contains(template.getTagName())
+ && !clearPictureTags.contains(template.getTagName())) {
return;
}
clearHandler.handler(context);
--
Gitblit v1.9.3