From b9dd4ee107e848428d6425d6e26b9f4354dbf00b Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 17 七月 2025 16:57:23 +0800
Subject: [PATCH] 点检自助维护表打印导出修复
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 56 ++++++++++++++++++++++++++++++--------------------------
2 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
index de02038..17d2d32 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamInspectionOrderMapper.xml
@@ -112,6 +112,7 @@
LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
LEFT JOIN eam_inspection_order t3 ON t3.inspection_date = t1.plan_inspection_date
AND t3.equipment_id = t1.equipment_id
+ AND t1.inspector IS NOT NULL
WHERE
t2.equipment_code = #{equipmentCode}
AND t3.inspection_date LIKE CONCAT(#{inspectionDate},'%')
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