From 8b43a416a2bb5188a25bfe0765fa1f42afe8bd23 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 22 三月 2024 10:00:04 +0800
Subject: [PATCH] 设备管理修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
index 0619819..b00c034 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml
@@ -12,11 +12,13 @@
             t5.realname AS equipmentInspectorUserName,
             t6.realname AS useUnitDirectorUserName,
             t7.realname AS equipmentInspectorSignUserName,
-            t1.each_tolerance AS eachTolerance,
-            t1.part_tolerance AS partTolerance,
-            t1.process_pass AS processPass,
+            t1.spare_part as sparePart,
+            ISNULL(t1.each_tolerance,'0') AS eachTolerance,
+            ISNULL(t1.part_tolerance,'0')  AS partTolerance,
+            ISNULL(t1.process_pass,'0') AS processPass,
+            ISNULL(t1.judgment_result,'qualified') AS judgmentResult,
             t1.meet_process_require AS meetProcessRequire,
-            t1.judgment_result AS judgmentResult,
+            t1.meet_process_require_remark AS meetProcessRequireRemark,
             t1.remark,
             t8.name AS equipmentName,
             t8.model AS equipmentModel,

--
Gitblit v1.9.3