From 4337640b7ab86136baed2fd6aa959e4828a75cea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 十二月 2023 17:33:51 +0800
Subject: [PATCH] 计算加工工件个数算法和密码安全策略
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml
index cf349a3..e96a4d0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceStandardDetailMapper.xml
@@ -17,14 +17,15 @@
t2.working_hour_quota AS workingHourQuota,
t3.id as maintenanceCycleId,
t3.NAME AS maintenanceCycleName,
- t5.NAME AS maintenanceSpecialtyName
-
+ t5.NAME AS maintenanceSpecialtyName,
+ t7.item_value as maintenanceRole
FROM
mom_eam_maintenance_standard_detail t1
LEFT JOIN mom_eam_maintenance_project t2 ON t1.maintenance_project_id = t2.id
LEFT JOIN mom_eam_maintenance_cycle t3 ON t1.maintenance_cycle_id = t3.id
LEFT JOIN mom_eam_maintenance_specialty t5 ON t5.id = t2.maintenance_specialty_id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t2.maintenance_method
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t1.maintenance_role
WHERE t1.del_flag = 0
<if test="maintenanceStandardId != null and maintenanceStandardId != ''">
and t1.maintenance_standard_id = #{maintenanceStandardId}
@@ -72,13 +73,14 @@
t1.photo photo,
t1.maintenance_require AS maintenanceRequire,
t6.item_text AS maintenanceModeName,
+ t7.item_text as maintenanceRoleName,
t2.id AS maintenanceProjectId,
t2.name,
t2.standard,
t4.item_text AS maintenanceMethodName,
t2.maintenance_tool AS maintenanceTool,
t2.working_hour_quota AS workingHourQuota,
- concat(t3.code, '/', t3.name) as maintenanceCycleName,
+ t3.name as maintenanceCycleName,
t5.NAME AS maintenanceSpecialtyName
FROM
mom_eam_maintenance_standard_detail t1
@@ -87,6 +89,7 @@
LEFT JOIN mom_eam_maintenance_specialty t5 ON t5.id = t2.maintenance_specialty_id
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_project_method' ) t4 ON t4.item_value = t2.maintenance_method
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_method' ) t6 ON t6.item_value = t1.maintenance_mode
+ LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_role' ) t7 ON t7.item_value = t1.maintenance_role
WHERE t1.del_flag = 0
<if test="params.maintenanceStandardId != null and params.maintenanceStandardId != ''">
and t1.maintenance_standard_id = #{params.maintenanceStandardId}
--
Gitblit v1.9.3