From 4c02aa5b2e859f1b2f7a080fd7c17f73ecf5f7c1 Mon Sep 17 00:00:00 2001
From: A0010407 <KHD@202305>
Date: Tue, 21 Nov 2023 13:51:41 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=AE-3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/domain/EquRepairWorkOrder.java  |  2 +-
 .../service/impl/DevicePDAServiceImpl.java    |  1 +
 .../device/EquRepairWorkOrderMapper.xml       | 24 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
index 4d3f743c..d7f062b6 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquRepairWorkOrder.java
@@ -186,7 +186,7 @@ public class EquRepairWorkOrder extends BaseEntity {
     /** 报修人 */
     private String orderRepairmanCode;
 
-    /** 联系方式 */
+    /** 报修人联系方式 */
     private String orderConnection;
 
     //班组
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
index ef9da765..3889ea54 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
@@ -628,6 +628,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             equRepairWorkOrder.setUpdateBy(SecurityUtils.getUsername());
             equRepairWorkOrder.setUpdateTime(DateUtils.getNowDate());
             equRepairWorkOrderMapper.updateEquRepairWorkOrder(equRepairWorkOrder);
+            //需要更新设备状态
             return success("提交成功，维修完成！");
         } catch (Exception e) {
             return error();
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml
index a2957e0b..3a44cbfa 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquRepairWorkOrderMapper.xml
@@ -21,8 +21,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="workDownMachine"	column="work_down_machine"	/>
 		<result property="workReason"	column="work_reason"	/>
 		<result property="workFaultDesc"	column="work_fault_desc"	/>
+
 		<result property="workStartTime"	column="work_start_time"	/>
 		<result property="workEndTime"	column="work_end_time"	/>
+
+		<result property="actualDownStartTime"	column="actual_down_start_time"	/>
+		<result property="actualDownEndTime"	column="actual_down_end_time"	/>
+		<result property="workConnection"	column="work_connection"	/>
+
 		<result property="workCostTime"	column="work_cost_time"	/>
 		<result property="workCost"	column="work_cost"	/>
 		<result property="workStatus"	column="work_status"	/>
@@ -103,6 +109,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			erwo.work_fault_desc,
 			erwo.work_start_time,
 			erwo.work_end_time,
+		    erwo.actual_down_start_time,
+		    erwo.actual_down_end_time,
+		    erwo.work_connection,
 			erwo.work_cost_time,
 			erwo.work_cost,
 			erwo.work_status,
@@ -178,6 +187,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		erwo.work_fault_desc,
 		erwo.work_start_time,
 		erwo.work_end_time,
+		erwo.actual_down_start_time,
+	    erwo.actual_down_end_time,
+		erwo.work_connection,
 		erwo.work_cost_time,
 		erwo.work_cost,
 		erwo.work_status,
@@ -223,6 +235,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			erwo.work_fault_desc,
 			erwo.work_start_time,
 			erwo.work_end_time,
+			erwo.actual_down_start_time,
+		    erwo.actual_down_end_time,
+		    erwo.work_connection,
 			erwo.work_cost_time,
 			erwo.work_cost,
 			erwo.work_status,
@@ -282,6 +297,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="workFaultDesc != null">work_fault_desc,</if>
 			<if test="workStartTime != null">work_start_time,</if>
 			<if test="workEndTime != null">work_end_time,</if>
+			<if test="actualDownStartTime != null">actual_down_start_time,</if>
+			<if test="actualDownEndTime != null">actual_down_end_time,</if>
+			<if test="workConnection != null">work_connection,</if>
 			<if test="workCostTime != null">work_cost_time,</if>
 			<if test="workCost != null">work_cost,</if>
 			<if test="workStatus != null">work_status,</if>
@@ -315,6 +333,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="workFaultDesc != null">#{workFaultDesc},</if>
 			<if test="workStartTime != null">#{workStartTime},</if>
 			<if test="workEndTime != null">#{workEndTime},</if>
+			<if test="actualDownStartTime != null">#{actualDownStartTime},</if>
+			<if test="actualDownEndTime != null">#{actualDownEndTime},</if>
+			<if test="workConnection != null">#{workConnection},</if>
 			<if test="workCostTime != null">#{workCostTime},</if>
 			<if test="workCost != null">#{workCost},</if>
 			<if test="workStatus != null">#{workStatus},</if>
@@ -351,6 +372,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="workFaultDesc != null">work_fault_desc = #{workFaultDesc},</if>
 			<if test="workStartTime != null">work_start_time = #{workStartTime},</if>
 			<if test="workEndTime != null">work_end_time = #{workEndTime},</if>
+			<if test="actualDownStartTime != null">actual_down_start_time = #{actualDownStartTime},</if>
+			<if test="actualDownEndTime != null">actual_down_end_time = #{actualDownEndTime},</if>
+			<if test="workConnection != null">work_connection = #{workConnection},</if>
 			<if test="workCostTime != null">work_cost_time = #{workCostTime},</if>
 			<if test="workCost != null">work_cost = #{workCost},</if>
 			<if test="workStatus != null">work_status = #{workStatus},</if>