From 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 07 三月 2025 16:16:18 +0800
Subject: [PATCH] art: 选择设备查询逻辑修改, 点检工单新增时产线逻辑修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceCycleMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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 7acdd3d..352d482 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
@@ -6,7 +6,7 @@
         select
         t1.id id,
         t1.code code,
-        concat(t1.cycle,t2.item_text) name,
+        t1.cycle name,
         t1.version version,
         t1.create_by createBy,
         t1.create_time createTime,
@@ -19,6 +19,8 @@
         t1.arrange_way arrangeWay,
         t1.audit_status auditStatus,
         t1.first_maintenance_time as firstMaintenanceTime,
+        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,
@@ -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