From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml | 8 ++++----
1 files changed, 4 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..c76e4ad 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,10 +12,10 @@
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.meet_process_require AS meetProcessRequire,
+ ISNULL(t1.each_tolerance,0) AS eachTolerance,
+ ISNULL(t1.part_tolerance,0) AS partTolerance,
+ ISNULL(t1.process_pass,0) AS processPass,
+ ISNULL(t1.meet_process_require,0) AS meetProcessRequire,
t1.judgment_result AS judgmentResult,
t1.remark,
t8.name AS equipmentName,
--
Gitblit v1.9.3