diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java index 5473315f..9ec04ca8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewMbomParentMapper.java @@ -32,6 +32,11 @@ public interface BomNewMbomParentMapper extends BaseMapper indexListPage(Page page, @Param("query") BomNewMbomParentQuery query ); + /** + * 递归向上查找所有数据 + * @param rowId 当前行 + * @return + */ List searchList(@Param("rowId") Long rowId ); diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java index 343a8f35..b018f890 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewMbomMiddleVO.java @@ -8,6 +8,9 @@ import lombok.experimental.Accessors; import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; +import java.util.Objects; /** * t_bom_new_mbom_parent @@ -201,7 +204,20 @@ public class BomNewMbomMiddleVO extends BaseMaterialVO implements Serializable { @ApiModelProperty(value = "是否虚拟件 0-否 1-是") private Integer virtualPartIs; + @ApiModelProperty(value = "是否有下级 0-否 1-是") + private Integer bomExist; + public Integer getBomExist(){ + if(Objects.isNull(bomExist)){ + return 0; + } + if(bomExist>0){return 1;} + return 0; + } + + + private List childNodes = Collections.emptyList(); + } diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml index eda0fa6b..24793bbe 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml +++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewMbomParentMapper.xml @@ -114,7 +114,7 @@