From 2f138ae0c0261ba5041142aed6bc105dc4dd7aca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor@qq.com>
Date: Fri, 26 Apr 2024 16:02:27 +0800
Subject: [PATCH] =?UTF-8?q?optimize:=20=E7=94=B5=E6=B0=94bom=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nflg/product/bomnew/pojo/vo/DQbomExcelVO.java | 7 +++++++
 .../bomnew/service/BomNewDQbomExceptionCheckService.java   | 6 ++----
 .../nflg/product/bomnew/service/DQBomImportService.java    | 2 +-
 .../java/com/nflg/product/bomnew/service/DQBomService.java | 6 +++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/DQbomExcelVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/DQbomExcelVO.java
index e3103c0e..a2fc6298 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/DQbomExcelVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/DQbomExcelVO.java
@@ -48,6 +48,13 @@ public class DQbomExcelVO extends BaseImportExcelDTO {
     @ExcelColumn("项目类别")
     private String projectType;
 
+    public String getProjectType() {
+        if (StrUtil.isBlank(projectType)) {
+            return "";
+        }
+        return projectType;
+    }
+
     @ExcelColumn("版本")
     private String currentVersion;
 
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewDQbomExceptionCheckService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewDQbomExceptionCheckService.java
index 16d7d209..80f688dd 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewDQbomExceptionCheckService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewDQbomExceptionCheckService.java
@@ -124,9 +124,7 @@ public class BomNewDQbomExceptionCheckService {
     private void checkParent(BomNewDQbomParentEntity parent) {
         EBomExceptionStatusEnum status = EBomExceptionStatusEnum.OK;
         if (parent.getRootIs() == 1 || parent.getUserRootIs() == 1) {
-            if (StrUtil.isBlank(parent.getProjectType())) {
-                status = EBomExceptionStatusEnum.EXCEPT_NO_8;
-            } else if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(parent.getProjectType()) || "Q".equals(parent.getProjectType())) {
+            if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, parent.getProjectType())) {
                 if (StrUtil.isBlank(parent.getMaterialName())) {
                     status = EBomExceptionStatusEnum.EXCEPT_NO_4;
                 }
@@ -167,7 +165,7 @@ public class BomNewDQbomExceptionCheckService {
         EBomExceptionStatusEnum status = EBomExceptionStatusEnum.OK;
         if (StrUtil.isBlank(child.getProjectType())) {
             status = EBomExceptionStatusEnum.EXCEPT_NO_8;
-        } else if (BomConstant.PROJECT_TYPE_TEMPORARY.equals(child.getProjectType()) || "Q".equals(child.getProjectType())) {
+        } else if (StrUtil.equals(BomConstant.PROJECT_TYPE_TEMPORARY, child.getProjectType())) {
             if (StrUtil.isBlank(child.getMaterialName())) {
                 status = EBomExceptionStatusEnum.EXCEPT_NO_4;
             }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
index a1cb81e1..fc0ddf28 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomImportService.java
@@ -390,7 +390,7 @@ public class DQBomImportService {
                 dQbomExcelVO.setNum(BigDecimal.ONE);
             }
         }
-        if (StrUtil.equals(dQbomExcelVO.getMaterialNo(), "9000000000")) {
+        if (StrUtil.equals(dQbomExcelVO.getMaterialNo(), BomConstant.PROJECT_TYPE_TEMPORARY_MATERIAL_NO)) {
             dQbomExcelVO.setProjectType(BomConstant.PROJECT_TYPE_TEMPORARY);
         }
         dQbomExcelVO.setCurrentVersion("");
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
index 8e571bab..568adeda 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/DQBomService.java
@@ -308,8 +308,8 @@ public class DQBomService {
         VUtils.isTure(!SessionUtil.getUserCode().equals(root.getCreatedBy())).throwMessage("不能删除他人创建的bom");
         VUtils.isTure(root.getStatus().equals(DQBomStatusEnum.PUBLISHED.getValue())).throwMessage("不能删除已发布的bom");
 
-        List<Long> liChildren = new ArrayList<>();
-        List<Long> liParents = new ArrayList<>();
+        Set<Long> liChildren = new HashSet<>();
+        Set<Long> liParents = new HashSet<>();
         liParents.add(root.getRowId());
         List<BomNewDQbomVO> children = dQBomChildService.getBomsByParentRowId(rowId);
         children.forEach(c -> {
@@ -319,7 +319,7 @@ public class DQBomService {
         dQBomChildService.getBaseMapper().deleteBatchIds(liChildren);
     }
 
-    private void delete(List<Long> parents, List<Long> children, BomNewDQbomVO bom) {
+    private void delete(Set<Long> parents, Set<Long> children, BomNewDQbomVO bom) {
         children.add(bom.getRowId());
         if (!Objects.isNull(bom.getBomRowId()) && bom.getBomCreateBy().equals(SessionUtil.getUserCode())) {
             parents.add(bom.getBomRowId());