From c47b351cc8e410993ed8cf1e27e3c50f7b52b371 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 08 八月 2025 18:06:47 +0800
Subject: [PATCH] 辐射试验近场生成报告优化,可以端口也可以P
---
inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
index f52260a..aa972e8 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/utils/FuSheUtils.java
@@ -527,7 +527,7 @@
Map<String, List<Map<String, Object>>> aggregatedMap = new HashMap<>();
Map<String, List<Map<String, Object>>> o1 = (Map<String, List<Map<String, Object>>>) dataRow.get(result);
for (String s2 : collect) {
- if (s2.contains("绔彛")) {
+ if (s2.contains("绔彛")||s2.contains("P")) {
List<Map<String, Object>> mapList = o1.get(s2);
list.addAll(mapList);
}
@@ -543,7 +543,7 @@
}
int rowNum = 2;
for (String s2 : aggregatedMap.keySet()) {
- if (s2.equals("绔彛") || s2.equals("棰戠巼")) {
+ if (s2.equals("绔彛") || s2.equals("棰戠巼") || s2.equals("P")) {
continue;
}
List<Map<String, Object>> mapList = aggregatedMap.get(s2);
@@ -629,7 +629,7 @@
run9.setText("");
for (int i = 0; i < collect.size(); i++) {
String s3 = collect.get(i);
- if (s3.contains("绔彛")) {
+ if (s3.contains("绔彛") ||s3.contains("P")) {
XWPFParagraph paragraph10 = table1.getRow(rowNum + 1).getCell(5 + i).getParagraphArray(0);
paragraph10.setAlignment(ParagraphAlignment.CENTER);
XWPFRun run10 = paragraph10.createRun();
@@ -716,6 +716,9 @@
List<Map<String, Object>> mapList1 = group.get(aDouble);
for (Map<String, Object> stringObjectMap : mapList1) {
String port = stringObjectMap.get("绔彛").toString();
+ if (ObjectUtils.isNull(port)){
+ port = stringObjectMap.get("P").toString();
+ }
for (int i = 5; i < cell - 1; i++) {
String text = table1.getRow(rowNum + 1).getCell(i).getText();
if (text.equals(port)) {
--
Gitblit v1.9.3