From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml
index 8cbfb9c..b22fe24 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardWorkInstructionMapper.xml
@@ -8,16 +8,16 @@
t1.num,
t2.name,
t2.type,
- t3.name AS typeName,
+ t3.item_text AS typeName,
t2.size
FROM
mom_eam_maintenance_standard_work_instruction t1
LEFT JOIN mom_sys_upload t2 ON t1.work_instruction_id = t2.id
- LEFT JOIN mom_eam_document_type t3 ON t3.id = t2.type
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'common_upload_type' ) t3 ON t3.item_value = t2.type
WHERE t1.del_flag = 0
<if test="params.maintenanceStandardId != null and params.maintenanceStandardId != ''">
and t1.maintenance_standard_id = #{params.maintenanceStandardId}
</if>
ORDER BY t1.create_time desc
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3