工单生成BUG解决

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

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>