From 9edd49a637232cea5bac9386ded3936a68837e6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Sun, 24 Dec 2023 10:00:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=BD=ACEBOM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/domain/EBom/CheckEBomException.java | 10 ++++++----
 .../mapper/master/BomNewOriginalParentMapper.xml       |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
index 43a54c8b..c848823c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/CheckEBomException.java
@@ -33,10 +33,12 @@ public class CheckEBomException {
     public CheckEBomException(Long bomRowId) throws ExecutionException, InterruptedException {
         allBomDetail = SpringUtil.getBean(BomNewEbomParentService.class).getBomTree(bomRowId);
         BomNewEbomParentEntity parent = SpringUtil.getBean(BomNewEbomParentService.class).getById(bomRowId);
-        BomNewEbomParentVO convert = Convert.convert(BomNewEbomParentVO.class, parent);
-        convert.setBomRowId(convert.getRowId());
-        convert.setParentRowId(0L);
-        allBomDetail.add(convert);
+        if(Objects.nonNull(parent)) {
+            BomNewEbomParentVO convert = Convert.convert(BomNewEbomParentVO.class, parent);
+            convert.setBomRowId(convert.getRowId());
+            convert.setParentRowId(0L);
+            allBomDetail.add(convert);
+        }
     }
 
     /**
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
index e4afcf2b..15f0d36b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalParentMapper.xml
@@ -48,7 +48,7 @@
              and status=2
 
              <if test="query.startDate==null or query.startDate==''">
-                 and created_time> DATE_ADD(now(), INTERVAL -3 DAY)
+                 and convert_to_ebom_time> DATE_ADD(now(), INTERVAL -3 DAY)
              </if>
             </if>
             <if test="query.status==1">
@@ -111,7 +111,7 @@
     </delete>
 
     <update id="updateBomState">
-        update t_bom_new_original_parent set status = #{status} where
+        update t_bom_new_original_parent set status = #{status},convert_to_ebom_time=now()   where
         row_id in
         <foreach collection="rowIds" item="rowId" open="(" separator="," close=")">
             #{rowId}