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" + + + + + + @@ -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" work_fault_desc, work_start_time, work_end_time, + actual_down_start_time, + actual_down_end_time, + work_connection, work_cost_time, work_cost, work_status, @@ -315,6 +333,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{workFaultDesc}, #{workStartTime}, #{workEndTime}, + #{actualDownStartTime}, + #{actualDownEndTime}, + #{workConnection}, #{workCostTime}, #{workCost}, #{workStatus}, @@ -351,6 +372,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" work_fault_desc = #{workFaultDesc}, work_start_time = #{workStartTime}, work_end_time = #{workEndTime}, + actual_down_start_time = #{actualDownStartTime}, + actual_down_end_time = #{actualDownEndTime}, + work_connection = #{workConnection}, work_cost_time = #{workCostTime}, work_cost = #{workCost}, work_status = #{workStatus},