From 5c0b7d3cbedb2bb1d22ceefc229b53d39dbddf70 Mon Sep 17 00:00:00 2001 From: wws <18630710203@163.com> Date: Mon, 4 Dec 2023 14:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=BC=80=E5=A7=8B/=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/device/mapper/EquOrderMapper.java | 7 +++++++ .../service/impl/DevicePDAServiceImpl.java | 18 ++++++++++++++++++ .../resources/mapper/device/EquOrderMapper.xml | 8 ++++++++ 3 files changed, 33 insertions(+) diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java index 123d0396..77c344f5 100644 --- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java +++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderMapper.java @@ -4,6 +4,7 @@ import java.util.List; import com.baomidou.dynamic.datasource.annotation.DS; import com.op.device.domain.EquOrder; +import com.op.device.domain.Equipment; import com.op.device.domain.dto.PDADTO; import org.apache.ibatis.annotations.Mapper; @@ -164,4 +165,10 @@ public interface EquOrderMapper { * @param repairCode */ void updateEquOrderStatusComplete(String repairCode); + + /** + * 更新设备状态 + * @param equ + */ + void updateEquipmentStatus(Equipment equ); } 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 6d28e899..ac2d6951 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 @@ -68,6 +68,8 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private EquipmentMapper equipmentMapper; + @Autowired + private EquOperationRecordMapper equOperationRecordMapper; /** @@ -325,6 +327,12 @@ public class DevicePDAServiceImpl implements IDevicePDAService { if (maintenanceFlag) { // 设置结束时间 equOrder.setOrderEnd(DateUtils.getNowDate()); + // 创建设备对象用于更新设备状态 + Equipment equ = new Equipment(); + equ.setEquipmentCode(equOrder.getEquipmentCode()); + // 更新设备状态为开机 + equ.setStatus("1"); + equOrderMapper.updateEquipmentStatus(equ); //上传附件 if (StringUtils.isNotEmpty(equOrder.getPicturePath())) { String[] ids = equOrder.getPicturePath().split(","); @@ -455,6 +463,16 @@ public class DevicePDAServiceImpl implements IDevicePDAService { order.setOrderStatus("3"); // 设置是否停机保养 order.setShutDown(pdadto.getShutDown()); + // 创建设备对象用于更新设备状态 + Equipment equ = new Equipment(); + equ.setEquipmentCode(order.getEquipmentCode()); + // 停机保养 + if (pdadto.getShutDown().equals("1")){ + // 更改设备状态为停机 + equ.setStatus("0"); + equOrderMapper.updateEquipmentStatus(equ); + } + // 设置开始时间 order.setOrderStart(DateUtils.getNowDate()); // 设置保养人 diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml index bede34e5..0d93ddf6 100644 --- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml +++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml @@ -358,4 +358,12 @@ and del_flag = '0' + + update base_equipment be + set be.status = #{status} + where be.equipmentCode = #{equipmentCode} + and be.del_flag = '0' + + +