From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PrecisionInspectionMapper.xml | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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..0c029d4 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,16 +12,19 @@
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,
t8.num AS equipmentNum,
- t9.depart_name AS useUnitName
+ t9.depart_name AS useUnitName,
+ t10.depart_name AS manageName
FROM
mom_eam_precision_inspection t1
LEFT JOIN sys_depart t2 ON t1.maintenance_unit = t2.id
@@ -31,7 +34,8 @@
LEFT JOIN sys_user t6 ON t1.use_unit_director_user = t6.id
LEFT JOIN sys_user t7 ON t1.equipment_inspector_sign_user = t7.id
LEFT JOIN mom_eam_equipment t8 ON t1.equipment_id = t8.id
- LEFT JOIN sys_depart t9 ON t1.use_unit = t9.id
+ LEFT JOIN sys_depart t9 ON t8.use_id = t9.id
+ left join sys_depart t10 on t8.manage_id = t9.id
where t1.del_flag = '0' and t1.maintenance_order_id = #{maintenanceOrderId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3