From 9b015b51b72ba050b4c38a6ba79eb45b7065e67d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 25 七月 2024 10:11:52 +0800
Subject: [PATCH] 调整sql

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceCycleMapper.xml |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceCycleMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceCycleMapper.xml
index 22cf087..1231877 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceCycleMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceCycleMapper.xml
@@ -19,8 +19,10 @@
         t1.arrange_way arrangeWay,
         t1.audit_status auditStatus,
         t1.first_maintenance_time as firstMaintenanceTime,
-        DATE_FORMAT(t1.first_maintenance_time, '%Y-%m-%d') firstMaintenanceTime1,
-        DATE_FORMAT(t1.first_maintenance_time, '%h:%i:%s') firstMaintenanceTime2,
+        t1.take_effect_time as takeEffectTime,
+        t1.lose_efficacy_time as loseEfficacyTime,
+        CONVERT(  VARCHAR(100), t1.first_maintenance_time, 23 ) firstMaintenanceTime1,
+        CONVERT(  VARCHAR(100), t1.first_maintenance_time, 8 ) firstMaintenanceTime2,
         t1.lead_time leadTime,
         t1.effective_time effectiveTime,
         t2.item_text cycleUnitName,
@@ -30,7 +32,9 @@
         t1.overdue_dispose_mode as overdueDisposeMode,
         t1.according_calendar as accordingCalendar,
         t8.item_text overdueDisposeModeName,
-        t9.item_text accordingCalendarName
+        t9.item_text accordingCalendarName,
+        t1.equipment_importance_id as equipmentImportanceId,
+        t1.maintenance_type as maintenanceType
         from mom_eam_maintenance_cycle t1
         left join (select * from v_sys_dict where dict_code = 'maintenance_cycle_unit') t2 on t1.cycle_unit=t2.item_value
         left join (select * from v_sys_dict where dict_code = 'cycle_time_unit') t3 on t1.unit=t3.item_value

--
Gitblit v1.9.3