From 90d9b80bf7522262669469b6e1b6be454e7f6906 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 15 Nov 2023 09:25:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B7=A5=E5=8D=95BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/op/device/mapper/EquOrderEquMapper.java    | 2 ++
 .../java/com/op/device/service/impl/EquOrderServiceImpl.java | 2 +-
 .../src/main/resources/mapper/device/EquOrderEquMapper.xml   | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java
index 1cd90aa40..0b212828a 100644
--- a/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java
+++ b/op-modules/op-device/src/main/java/com/op/device/mapper/EquOrderEquMapper.java
@@ -70,4 +70,6 @@ public interface EquOrderEquMapper {
 
     int insertEquOrderEqus(@Param("list") List<EquPlanEqu> equs);
 
+    // 通过工单code查询设备order
+    EquOrderEqu selectEquOrderEquListByOrderCode(String orderCode);
 }
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
index d3d86bc4e..e2886ec1e 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
@@ -116,7 +116,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
     public List<EquOrder> selectEquOrderList(EquOrder equOrder) {
         List<EquOrder> orderList = equOrderMapper.selectEquOrderList(equOrder);
         for (EquOrder order : orderList) {
-            EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByParentCode(order.getOrderId());
+            EquOrderEqu equ = equOrderEquMapper.selectEquOrderEquListByOrderCode(order.getOrderCode());
             order.setEquipmentCode(equ.getEquipmentCode());
             order.setEquipmentName(equ.getEquipmentName());
         }
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml
index 4802141ec..19dc98a33 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderEquMapper.xml
@@ -52,6 +52,11 @@
         where parent_code = #{parentCode} and del_flag = '0'
     </select>
 
+    <select id="selectEquOrderEquListByOrderCode" parameterType="String" resultMap="EquOrderEquResult">
+        <include refid="selectEquOrderEquVo"/>
+        where order_code = #{orderCode} and del_flag = '0'
+    </select>
+
     <insert id="insertEquOrderEqu" parameterType="EquOrderEqu">
         insert into equ_order_equ
         <trim prefix="(" suffix=")" suffixOverrides=",">