From ed48aa9f30a87c528f071d06bf6b59d7d15428e9 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 26 五月 2025 16:12:55 +0800
Subject: [PATCH] 点检报表后端
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceCycleMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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..e48899d 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,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,10 @@
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,
+ t10.item_text maintenanceTypeName
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
@@ -38,6 +43,7 @@
left join (select * from v_sys_dict where dict_code = 'version_status') t6 on t1.version_status=t6.item_value
left join (select * from v_sys_dict where dict_code = 'overdue_dispose_mode') t8 on t1.overdue_dispose_mode=t8.item_value
left join (select * from v_sys_dict where dict_code = 'according_calendar') t9 on t1.according_calendar=t9.item_value
+ left join (select * from v_sys_dict where dict_code = 'maintenance_type') t10 on t1.maintenance_type=t10.item_value
where 1=1
<if test="maintenanceCycle.version!=null and maintenanceCycle.version!= ''">
and t1.version=#{maintenanceCycle.version}
--
Gitblit v1.9.3