From 739bc7237cda0a5c7e303221bfbad003818b3941 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Mon, 4 Dec 2023 13:36:21 +0800
Subject: [PATCH] =?UTF-8?q?PDA=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BABUG+=E4=BF=9D=E5=85=BB=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/service/impl/DevicePDAServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 c744876d3..6d28e8999 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<String> upkeepPictures = equFileMapper.selectUrlList(selectTemp);
         if (upkeepPictures != null) {
             order.setUpkeepPictures(upkeepPictures);