From 6965200126a0d44cf16bdb3597f2c1acc0044e7b Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Thu, 30 Nov 2023 19:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=94=9F=E6=88=90BUG?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EquUpkeepServiceImpl.java    | 22 +++++++++++++++++++
 .../mapper/device/EquOrderDetailMapper.xml    |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java
index ce0a9008..259af103 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquUpkeepServiceImpl.java
@@ -187,6 +187,28 @@ public class EquUpkeepServiceImpl implements IEquUpkeepService {
                         EquPlanDetail detail = new EquPlanDetail();
                         BeanUtils.copyProperties(checkItem,detail);
 
+                        if (!detail.getItemCode().isEmpty()) {
+                            itemTempName.append(detail.getItemName()).append(",");
+                            // 获取检查项详情list
+                            List<EquCheckItemDetail> equCheckItemDetailList = equCheckItemDetailMapper.selectCheckItemDetailByItemCode(detail.getItemCode());
+                            if (equCheckItemList.size() > 0) {
+                                List<EquPlanStandard> standardList = new ArrayList<>();
+                                for (EquCheckItemDetail standardTemp : equCheckItemDetailList) {
+                                    EquPlanStandard standard = new EquPlanStandard();
+                                    BeanUtils.copyProperties(standardTemp,standard);
+
+                                    standard.setShowFlag(true);
+                                    standardList.add(standard);
+                                }
+                                detail.setEquPlanStandardList(standardList);
+                            }
+                        }
+                        detailList.add(detail);
+                    }
+                    if (data.getItemLoop() == 0) {
+                        EquPlanDetail detail = new EquPlanDetail();
+                        BeanUtils.copyProperties(checkItem,detail);
+
                         if (!detail.getItemCode().isEmpty()) {
                             itemTempName.append(detail.getItemName()).append(",");
                             // 获取检查项详情list
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml
index ea050820..9556f487 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderDetailMapper.xml
@@ -113,13 +113,14 @@
             <if test="itemTools != null">#{itemTools},</if>
         </trim>
     </insert>
+
     <insert id="insertEquOrderDetails">
         insert into equ_order_detail
         (
             id,  order_code,
             item_code, item_name, item_method,
             item_type, item_type_name, factory_code, del_flag,
-            create_by, create_time,item_tools
+            create_by, create_time
         )
         VALUES
         <foreach collection="list" index="index" item="item" separator=",">
@@ -127,7 +128,7 @@
             #{item.id},#{item.parentCode},
             #{item.itemCode},#{item.itemName},#{item.itemMethod},
             #{item.itemType},#{item.itemTypeName},#{item.factoryCode},#{item.delFlag},
-            #{item.createBy},#{item.createTime},#{itemTools}
+            #{item.createBy},#{item.createTime}
         )
         </foreach>