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 c744876d..6d28e899 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 @@ -66,6 +66,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { @Autowired private SparePartsLedgerMapper sparePartsLedgerMapper; + @Autowired + private EquipmentMapper equipmentMapper; + /** * 获取今日巡检任务工单list-状态不为已完成 @@ -115,6 +118,9 @@ public class DevicePDAServiceImpl implements IDevicePDAService { timeArray.add(order.getOrderEnd()); order.setTimeArray(timeArray); + // 设备名称 + order.setEquipmentName(equipmentMapper.selectEquipmentByEquipmentCode(order.getEquipmentCode()).getEquipmentName()); + order.setPlanName(equOrderMapper.selectPlanNameByPlanCode(order.getOrderCode())); order.setWorkCenterName(equOrderMapper.selectCenterNameByCenterCode(order.getPlanWorkshop())); @@ -155,7 +161,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService { // 保养图片 BaseFileData selectTemp = new BaseFileData(); - selectTemp.setSourceId(equOrder.getId()); + selectTemp.setSourceId(order.getOrderId()); List upkeepPictures = equFileMapper.selectUrlList(selectTemp); if (upkeepPictures != null) { order.setUpkeepPictures(upkeepPictures);