diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java index 09902d71..bb0cc756 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java @@ -1,6 +1,5 @@ package com.nflg.product.bomnew.pojo.vo; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -8,8 +7,6 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; -import java.text.SimpleDateFormat; -import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Collections; @@ -328,6 +325,8 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "异常确认标记") private String exceptionTag; + @ApiModelProperty(value = "待复核根节点") + private Integer rootIsForWaitReview; private List childNodes = Collections.emptyList(); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 3dbc7a96..70f9e8c1 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -1322,7 +1322,10 @@ public class BomNewEbomParentService extends ServiceImpl rowIds = dto.getRowIdList(); - List bomNewEbomParentEntityList = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, rowIds).eq(BomNewEbomParentEntity::getUserRootIs, 1).list(); + List bomNewEbomParentEntityList = this.lambdaQuery() + .in(BomNewEbomParentEntity::getRowId, rowIds) + .and(a -> a.eq(BomNewEbomParentEntity::getUserRootIs, 1).or().eq(BomNewEbomParentEntity::getRootIsForWaitReview, 1)) + .list(); if (CollUtil.isEmpty(bomNewEbomParentEntityList)) { // return ResultVO.error("下级BOM无法进行复核");