From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml b/north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml
index 741cc4c..9997a88 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/DeviceMaintenance.xml
@@ -63,7 +63,21 @@
</insert>
<select id="selectMaintenanceMp" resultMap="DeviceMaintenanceMapper">
- select * from device_maintenance where DATE_FORMAT((create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
+ select id,
+ device_id,
+ device_name,
+ type,
+ date(fault_time) as fault_time,
+ fault_reason,
+ date(maintenance_time) as maintenance_time,
+ maintenance_illustrate,
+ date(start_time) as start_time,
+ date(stop_time) as stop_time,
+ process,
+ personnel,
+ cost
+ from device_maintenance
+ where DATE_FORMAT((create_time), '%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
</select>
<delete id="deleteMaintenanceMp">
@@ -86,6 +100,34 @@
</select>
<select id="openSelectIdMp">
- select * from device_maintenance where id = #{id}
+ select id,
+ device_id,
+ device_name,
+ type,
+ date(fault_time) as fault_time,
+ fault_reason,
+ date(maintenance_time) as maintenance_time,
+ maintenance_illustrate,
+ date(start_time) as start_time,
+ date(stop_time) as stop_time,
+ process,
+ personnel,
+ cost from device_maintenance where id = #{id}
</select>
+
+ <update id="updateMaintenanceMp">
+ update device_maintenance set
+ device_name = #{deviceName},
+ type = #{type},
+ fault_time = #{faultTime},
+ fault_reason = #{faultReason},
+ maintenance_time = #{maintenanceTime},
+ maintenance_illustrate = #{maintenanceIllustrate},
+ start_time = #{startTime},
+ stop_time = #{stopTime},
+ process = #{process},
+ personnel = #{personnel},
+ cost = #{cost}
+ where id = #{id}
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0