合同段划分导入相关

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -624,7 +624,9 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
         try {
             //修改节点信息
             List<WbsTreeContract> wbsTreeContracts = BeanUtil.copyProperties(successData, WbsTreeContract.class);
-            this.saveOrUpdateBatch(wbsTreeContracts, 1000);
+            if (wbsTreeContracts.size() > 0) {
+                this.saveOrUpdateBatch(wbsTreeContracts, 1000);
+            }
 
             //导入识别匹配成功树
             ArrayList<WbsTreeContractVO> collect = successData.stream().collect(
@@ -660,7 +662,6 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
             Long nodeParentIdLv2 = 0L;
             Long nodeParentIdLv3 = 0L;
             Long nodeParentIdLv4 = 0L;
-            Long nodeParentIdLv5 = 0L;
             //当前行，失败节点
             List<WbsTreeContractVO> failList = new ArrayList<>();
             //当前行，成功节点
@@ -695,15 +696,12 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 for (WbsTreeContractVO wbsTreeContractVO : failList) {
                     if (wbsTreeContractVO.getNodeType() == 1) {
                         nodeParentIdLv1 = wbsTreeContractVO.getId();
-                    } else
-                    if (wbsTreeContractVO.getNodeType() == 2) {
+                    } else if (wbsTreeContractVO.getNodeType() == 2) {
                         nodeParentIdLv2 = wbsTreeContractVO.getId();
                     } else if (wbsTreeContractVO.getNodeType() == 3) {
                         nodeParentIdLv3 = wbsTreeContractVO.getId();
                     } else if (wbsTreeContractVO.getNodeType() == 4) {
                         nodeParentIdLv4 = wbsTreeContractVO.getId();
-                    } else if (wbsTreeContractVO.getNodeType() == 5) {
-                        nodeParentIdLv5 = wbsTreeContractVO.getId();
                     }
                 }
             }
@@ -713,164 +711,66 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                 for (WbsTreeContractVO successDatum : successList) {
                     if (successDatum.getNodeType() == 1) {
                         nodeParentIdLv1 = successDatum.getId();
-                    } else
-                    if (successDatum.getNodeType() == 2) {
+                    } else if (successDatum.getNodeType() == 2) {
                         nodeParentIdLv2 = successDatum.getId();
                     } else if (successDatum.getNodeType() == 3) {
                         nodeParentIdLv3 = successDatum.getId();
                     } else if (successDatum.getNodeType() == 4) {
                         nodeParentIdLv4 = successDatum.getId();
-                    } else if (successDatum.getNodeType() == 5) {
-                        nodeParentIdLv5 = successDatum.getId();
                     }
                 }
             }
 
             //构建未成功节点的父级id
-            if (successList.size() > 0 && failList.size() > 0) {
+            if (failList.size() > 0) {
                 for (WbsTreeContractVO failDatum : failList) {
                     if (failDatum.getNodeType() == 1) {
                         failDatum.setParentId(0L);
 
                     } else if (failDatum.getNodeType() == 2) {
+                        failDatum.setParentId(nodeParentIdLv1);
+                        nodeParentIdLv2 = failDatum.getId();
+
+
+                    } else if (failDatum.getNodeType() == 3) {
                         if (nodeParentIdLv2 == 0L) {
                             failDatum.setParentId(0L);
                         } else {
                             failDatum.setParentId(nodeParentIdLv2);
-                            nodeParentIdLv2 = failDatum.getId();
-                        }
-
-                    } else if (failDatum.getNodeType() == 3) {
-                        if (nodeParentIdLv3 == 0L) {
-                            if (nodeParentIdLv2 == 0L) {
-                                failDatum.setParentId(0L);
-                            } else {
-                                failDatum.setParentId(nodeParentIdLv2);
-                                nodeParentIdLv3 = failDatum.getId();
-                            }
-                        } else {
-                            failDatum.setParentId(nodeParentIdLv3);
                             nodeParentIdLv3 = failDatum.getId();
                         }
 
                     } else if (failDatum.getNodeType() == 4) {
-                        if (nodeParentIdLv4 == 0L) {
-                            if (nodeParentIdLv3 == 0L) {
-                                if (nodeParentIdLv2 == 0L) {
-                                    failDatum.setParentId(0L);
-                                } else {
-                                    failDatum.setParentId(nodeParentIdLv2);
-                                    nodeParentIdLv4 = failDatum.getId();
-                                }
-                            } else {
-                                failDatum.setParentId(nodeParentIdLv3);
-                                nodeParentIdLv4 = failDatum.getId();
-                            }
-                        } else {
-                            failDatum.setParentId(nodeParentIdLv4);
-                            nodeParentIdLv4 = failDatum.getId();
-                        }
-
-                    } else if (failDatum.getNodeType() == 5) {
-                        if (nodeParentIdLv5 == 0L) {
-                            if (nodeParentIdLv4 == 0L) {
-                                if (nodeParentIdLv3 == 0L) {
-                                    if (nodeParentIdLv2 == 0L) {
-                                        failDatum.setParentId(0L);
-                                    } else {
-                                        failDatum.setParentId(nodeParentIdLv2);
-                                        nodeParentIdLv5 = failDatum.getId();
-                                    }
-                                } else {
-                                    failDatum.setParentId(nodeParentIdLv3);
-                                    nodeParentIdLv5 = failDatum.getId();
-                                }
-                            } else {
-                                failDatum.setParentId(nodeParentIdLv4);
-                                nodeParentIdLv5 = failDatum.getId();
-                            }
-                        } else {
-                            failDatum.setParentId(nodeParentIdLv5);
-                            nodeParentIdLv5 = failDatum.getId();
-                        }
-                    }
-                }
-            }
-
-            //所有都是失败节点
-            if (successList.size() == 0 && failList.size() > 0) {
-                for (WbsTreeContractVO failDatum : failList) {
-                    if (failDatum.getNodeType() == 1) {
-                        failDatum.setParentId(0L);
-
-                    } else if (failDatum.getNodeType() == 2) {
-                        if (nodeParentIdLv2 == 0L) {
-                            failDatum.setParentId(nodeParentIdLv1);
-                        } else {
-                            failDatum.setParentId(nodeParentIdLv1);
-                            nodeParentIdLv2 = failDatum.getId();
-                        }
-
-                    } else if (failDatum.getNodeType() == 3) {
                         if (nodeParentIdLv3 == 0L) {
                             if (nodeParentIdLv2 == 0L) {
                                 failDatum.setParentId(0L);
                             } else {
                                 failDatum.setParentId(nodeParentIdLv2);
-                                nodeParentIdLv3 = failDatum.getId();
+                                nodeParentIdLv4 = failDatum.getId();
                             }
                         } else {
                             failDatum.setParentId(nodeParentIdLv3);
-                            nodeParentIdLv3 = failDatum.getId();
+                            nodeParentIdLv4 = failDatum.getId();
                         }
 
-                    } else if (failDatum.getNodeType() == 4) {
+                    } else if (failDatum.getNodeType() == 5) {
                         if (nodeParentIdLv4 == 0L) {
                             if (nodeParentIdLv3 == 0L) {
                                 if (nodeParentIdLv2 == 0L) {
                                     failDatum.setParentId(0L);
                                 } else {
                                     failDatum.setParentId(nodeParentIdLv2);
-                                    nodeParentIdLv4 = failDatum.getId();
                                 }
                             } else {
                                 failDatum.setParentId(nodeParentIdLv3);
-                                nodeParentIdLv4 = failDatum.getId();
                             }
                         } else {
                             failDatum.setParentId(nodeParentIdLv4);
-                            nodeParentIdLv4 = failDatum.getId();
-                        }
-
-                    } else if (failDatum.getNodeType() == 5) {
-                        if (nodeParentIdLv5 == 0L) {
-                            if (nodeParentIdLv4 == 0L) {
-                                if (nodeParentIdLv3 == 0L) {
-                                    if (nodeParentIdLv2 == 0L) {
-                                        failDatum.setParentId(0L);
-                                    } else {
-                                        failDatum.setParentId(nodeParentIdLv2);
-                                        nodeParentIdLv5 = failDatum.getId();
-                                    }
-                                } else {
-                                    failDatum.setParentId(nodeParentIdLv3);
-                                    nodeParentIdLv5 = failDatum.getId();
-                                }
-                            } else {
-                                failDatum.setParentId(nodeParentIdLv4);
-                                nodeParentIdLv5 = failDatum.getId();
-                            }
-                        } else {
-                            failDatum.setParentId(nodeParentIdLv5);
-                            nodeParentIdLv5 = failDatum.getId();
                         }
                     }
                 }
             }
 
-            //移除当前行构建成功节点，执行下一行时不再构建该节点
-            failData.removeAll(failList);
-
             //添加构建成功节点
             resultData.addAll(failList);
             if (failList.size() > 0) {