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/MaintenanceStandardDetailMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 cb855db..9684ed6 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
@@ -18,7 +18,7 @@
             t3.id as maintenanceCycleId,
             t3.NAME AS maintenanceCycleName,
             t5.NAME AS maintenanceSpecialtyName,
-            t7.item_value as maintenanceRole
+            t7.item_text as maintenanceRole
         FROM
             mom_eam_maintenance_standard_detail t1
         LEFT JOIN mom_eam_maintenance_project t2 ON t1.maintenance_project_id = t2.id
@@ -80,7 +80,7 @@
             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

--
Gitblit v1.9.3