From 1b81a44e010578f325ddc19f08d009f8f740507a Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Wed, 6 Dec 2023 21:59:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/pojo/entity/BomNewOriginalChildEntity.java | 4 ++++
 .../service/domain/OriginalBom/OriginalBomDetailTask.java     | 3 ++-
 .../resources/mapper/master/BomNewOriginalChildMapper.xml     | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
index b87c9a09..c0229e53 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewOriginalChildEntity.java
@@ -117,6 +117,10 @@ public class BomNewOriginalChildEntity implements Serializable {
     @ApiModelProperty(value = "处理状态：1=待处理、2=已处理")
     private Integer editStatus;
 
+
+    @ApiModelProperty("状态 1=待转换、2=已转")
+    private Integer status;
+
     public BigDecimal getTotalWeight() {
         return NumberUtil.mul(this.getUnitWeight(), this.num);
     }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java
index 6799a0f5..7c2921ec 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomDetailTask.java
@@ -16,6 +16,7 @@ import lombok.Setter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.RecursiveTask;
 import java.util.stream.Collectors;
 
@@ -92,7 +93,7 @@ public class OriginalBomDetailTask extends RecursiveTask<List<BomOriginalListVO>
         result.addAll(bomDetail);
 
         if (CollUtil.isNotEmpty(bomDetail)) {
-            List<BomOriginalListVO> collect = bomDetail.stream().filter(u -> u.getStatus().equals(1)).collect(Collectors.toList());
+            List<BomOriginalListVO> collect = bomDetail.stream().filter(u -> Objects.isNull(u.getStatus())|| u.getStatus().equals(1)).collect(Collectors.toList());
             levelNumAdd(collect.size());
             List<Long> childBowIds = bomDetail.stream().filter(u-> u.getChildBomRowId()!=null && u.getChildBomRowId() > 0).map(u->u.getChildBomRowId()).collect(Collectors.toList());
             if(CollUtil.isNotEmpty(childBowIds)) {
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
index 11bc5722..068010b4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewOriginalChildMapper.xml
@@ -18,7 +18,8 @@
             <result column="remark" property="remark"  jdbcType="VARCHAR"/>
             <result column="created_by" property="createdBy"  jdbcType="VARCHAR"/>
             <result column="edit_status" property="editStatus" jdbcType="INTEGER"/>
-          <result column="created_time" property="createdTime"  jdbcType="TIMESTAMP"/>
+            <result column="created_time" property="createdTime"  jdbcType="TIMESTAMP"/>
+            <result column="status" property="status" jdbcType="INTEGER"/>
         </resultMap>
 
     <sql id="Base_Column_List">