From 0c36e85b7267f96c4fe57bc567f44c8c02bfdbac Mon Sep 17 00:00:00 2001
From: yangbin <1113799176@qq.com>
Date: 星期四, 17 七月 2025 17:07:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 56 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 30 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 487d9fc..c91a37c 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -252,19 +252,21 @@
for (int i = 1; i <= 31; i++) {
if (collect.containsKey(i)) {
String inspectionResult = "";
- switch (collect.get(i).getInspectionResult()) {
- case "NORMAL":
- inspectionResult = "鈭�";
- break;
- case "ANOMALY":
- inspectionResult = "脳";
- break;
- case "FAULT":
- inspectionResult = "鈻�";
- break;
- case "CLOSE":
- inspectionResult = "T";
- break;
+ if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
+ switch (collect.get(i).getInspectionResult()) {
+ case "NORMAL":
+ inspectionResult = "鈭�";
+ break;
+ case "ANOMALY":
+ inspectionResult = "脳";
+ break;
+ case "FAULT":
+ inspectionResult = "鈻�";
+ break;
+ case "CLOSE":
+ inspectionResult = "T";
+ break;
+ }
}
resultMap.put("inspectionResult" + i, inspectionResult);
} else {
@@ -386,19 +388,21 @@
for (int i = 1; i <= 5; i++) {
if (collect.containsKey(i)) {
String inspectionResult = "";
- switch (collect.get(i).getInspectionResult()) {
- case "NORMAL":
- inspectionResult = "鈭�";
- break;
- case "ANOMALY":
- inspectionResult = "脳";
- break;
- case "FAULT":
- inspectionResult = "鈻�";
- break;
- case "CLOSE":
- inspectionResult = "T";
- break;
+ if (!StrUtils.isEmpty(collect.get(i).getInspectionResult())) {
+ switch (collect.get(i).getInspectionResult()) {
+ case "NORMAL":
+ inspectionResult = "鈭�";
+ break;
+ case "ANOMALY":
+ inspectionResult = "脳";
+ break;
+ case "FAULT":
+ inspectionResult = "鈻�";
+ break;
+ case "CLOSE":
+ inspectionResult = "T";
+ break;
+ }
}
resultMap.put("inspectionResult" + i, inspectionResult);
} else {
--
Gitblit v1.9.3