From f1e4e1427bf35e7d1cb3e0b580cf9995a472f214 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 18 八月 2025 17:40:12 +0800
Subject: [PATCH] 添加设备类别
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
index abcb111..2054ac4 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
@@ -3,10 +3,46 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper">
<select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
- select wmo.*, e.equipment_code, e.equipment_name
+ select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model
from eam_third_maintenance_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
${ew.customSqlSegment}
</select>
-</mapper>
\ No newline at end of file
+
+ <select id="findThirdMaintenanceBaseInfo" resultType="org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse">
+ SELECT
+ t1.hf_code_a,
+ t1.hf_code_b,
+ t2.equipment_code,
+ t2.equipment_name,
+ t2.equipment_model,
+ t3.factory_name,
+ CONVERT ( VARCHAR ( 4 ), YEAR ( TRY_CONVERT ( DATE, t1.maintenance_date ) ) ) + '骞�' + CONVERT ( VARCHAR ( 2 ), MONTH ( TRY_CONVERT ( DATE, t1.maintenance_date ) ) ) + '鏈�' + CONVERT ( VARCHAR ( 2 ), DAY ( TRY_CONVERT ( DATE, t1.maintenance_date ) ) ) + '鏃�' AS maintenance_date,
+ t1.fully_functional,
+ t1.running_normally,
+ t1.problem_description,
+ t1.operator_signature,
+ t1.assistant_operator,
+ t1.repairman_signature,
+ t1.assistant_repairman,
+ t1.repair_manager_signature,
+ t1.inspector_signature,
+ t2.equipment_category
+ FROM
+ eam_third_maintenance_order t1
+ LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
+ LEFT JOIN eam_base_factory t3 ON t3.org_code = SUBSTRING ( t2.factory_org_code , 1, 6 )
+ WHERE t1.id = #{id}
+ </select>
+ <select id="queryList" resultType="org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExport">
+ select wmo.*,FORMAT(CAST(wmo.maintenance_date AS DATE), 'yyyy骞碝M鏈坉d鏃�') AS maintenance_date_formatted,
+ e.equipment_code, e.equipment_name, e.equipment_model,e.equipment_category
+ ,f.factory_name
+ from eam_third_maintenance_order wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ LEFT JOIN eam_base_factory f ON f.org_code = SUBSTRING ( e.factory_org_code , 1, 6 )
+ ${ew.customSqlSegment}
+ </select>
+</mapper>
--
Gitblit v1.9.3