From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
index 161ea61..df3cd31 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardMethodServiceImpl.java
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.util.*;
import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
/**
* @author Administrator
@@ -168,6 +169,9 @@
@Override
public Map<String, List<?>> selectsStandardMethodByFLSSM(String tree) {
+ if (tree == null || tree.trim().isEmpty()) {
+ return Collections.emptyMap();
+ }
String[] trees = tree.split(" - ");
Map<String, List<?>> map = new HashMap<>();
String str = "";
@@ -193,7 +197,8 @@
return map;
}
standardMethodLists.addAll(standardMethodMapper.selectStandardMethodListsByNull(str));
- map.put("standardMethodList", standardMethodLists);
+ List<StandardMethodList> collect = standardMethodLists.stream().distinct().collect(Collectors.toList());
+ map.put("standardMethodList", collect);
return map;
}
--
Gitblit v1.9.3