From 2c250bb7d2c0efd16e5f124648bc77f5fd93040a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 29 十月 2023 22:05:14 +0800
Subject: [PATCH] 增加下次三保时间 技术状态类型及单号
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
index fbbbff6..acc64f2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml
@@ -10,6 +10,7 @@
t1.photo,
t1.maintenance_project_id as maintenanceProjectId,
t3.num as maintenanceProjectNum,
+ t3.name as maintenanceProjectName,
t3.standard,
t4.item_text as maintenanceMethod,
t3.maintenance_tool as maintenanceTool
@@ -45,9 +46,11 @@
t1.status,
t5.item_text as statusName,
t1.num,
+ t1.num as technologyStatusVerificationBill,
t4.id as maintenanceCycleId,
t4.maintenance_type as maintenanceType,
t10.item_text as maintenanceTypeName,
+ t4.cycle as maintenanceCycle,
concat(t4.code, '/', t4.name) as maintenanceCycleName,
t3.id as equipmentId,
t3.num as equipmentNum,
@@ -79,7 +82,11 @@
t1.remark,
t1.description,
t1.precision_inspection_status as precisionInspectionStatus,
- t1.stove_exempt_status as stoveExemptStatus
+ t1.stove_exempt_status as stoveExemptStatus,
+ t1.inspect_user as inspectUser,
+ t1.inspect_date as inspectDate,
+ t12.item_text as checkStatusName,
+ t1.not_pass_reason as notPassReason
FROM
mom_eam_daily_maintenance_order t1
LEFT JOIN mom_eam_maintenance_standard t2 ON t1.maintenance_standard_id = t2.id
@@ -92,6 +99,7 @@
left join sys_user t8 on t1.maintenance_user_id = t8.id
left join ( SELECT * FROM v_sys_dict WHERE dict_code = 'assign_mode' ) t9 on t9.item_value = t2.assign_mode
left join (SELECT * FROM v_sys_dict WHERE dict_code = 'maintenance_type') t10 on t10.item_value = t4.maintenance_type
+ left join (SELECT * FROM v_sys_dict WHERE dict_code = 'check_status') t12 on t12.item_value = t1.check_status
WHERE t1.del_flag = 0 and t2.del_flag = 0 and t3.del_flag = 0 and t4.del_flag = 0 and t4.maintenance_type =#{params.maintenanceType}
<if test="params.num != null and params.num != ''">
and t1.num like concat('%',#{params.num},'%')
@@ -107,11 +115,15 @@
t1.location,
t1.photo,
t1.maintenance_project_id AS maintenanceProjectId,
+ case t1.maintenance_role when 'operator' then '鎿嶄綔浜哄憳淇濆吇鍐呭' else '缁翠慨浜哄憳淇濆吇鍐呭' end as maintenanceRole,
t3.num AS maintenanceProjectNum,
+ t3.name as maintenanceProjectName,
t3.standard,
t4.item_text AS maintenanceMethod,
t3.maintenance_tool AS maintenanceTool,
- t3.working_hour_quota AS workingHourQuota
+ t3.working_hour_quota AS workingHourQuota,
+ tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
+ tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
FROM
mom_eam_daily_maintenance_order_detail tt
LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id
--
Gitblit v1.9.3