同步-同步合同段

1、去除代码中的跳过 避免业务中断导致新增表达那不了

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

@@ -719,24 +719,24 @@ public class WbsSynchronousServiceImpl {
                                                     //没有选择未填报，但是表单查不到数据，表示这个节点有问题
                                                     if (i == 0 && !contractRanges.contains(WbsSyncTypeEnum.NOT_FILLED_IN.code)) {
                                                         errorMsg.append(editContractNode.getNodeName() + "(" + editContractNode.getPKeyId() + ")").append("未填报;");
-                                                        continue;
-                                                    }
-                                                    if (contractRanges.contains(WbsSyncTypeEnum.ALREADY_FILLED_IN_NOT_REPORTED.code) && (submit == null || submit == 0)) {
-                                                        //已填报-未上报 102
-                                                        isSync = true;
-                                                    } else {
-                                                        if (submit == null) {
-                                                            isSync = false;
-                                                            errorMsg.append(editContractNode.getNodeName() + "(" + editContractNode.getPKeyId() + ")").append("未上报;");
+                                                    }else{
+                                                        if (contractRanges.contains(WbsSyncTypeEnum.ALREADY_FILLED_IN_NOT_REPORTED.code) && (submit == null || submit == 0)) {
+                                                            //已填报-未上报 102
+                                                            isSync = true;
                                                         } else {
-                                                            if (submit == 1 && contractRanges.contains(WbsSyncTypeEnum.PENDING_APPROVAL.code)) {
-                                                                //待审批 104
-                                                                isSync = true;
-                                                                isOldHtml = true;
-                                                            } else if (submit == 2 && contractRanges.contains(WbsSyncTypeEnum.APPROVED.code)) {
-                                                                //已审批 105
-                                                                isSync = true;
-                                                                isOldHtml = true;
+                                                            if (submit == null) {
+                                                                isSync = false;
+                                                                errorMsg.append(editContractNode.getNodeName() + "(" + editContractNode.getPKeyId() + ")").append("未上报;");
+                                                            } else {
+                                                                if (submit == 1 && contractRanges.contains(WbsSyncTypeEnum.PENDING_APPROVAL.code)) {
+                                                                    //待审批 104
+                                                                    isSync = true;
+                                                                    isOldHtml = true;
+                                                                } else if (submit == 2 && contractRanges.contains(WbsSyncTypeEnum.APPROVED.code)) {
+                                                                    //已审批 105
+                                                                    isSync = true;
+                                                                    isOldHtml = true;
+                                                                }
                                                             }
                                                         }
                                                     }
@@ -766,13 +766,13 @@ public class WbsSynchronousServiceImpl {
                                     if (collect.contains(2) || collect.contains(3) || collect.contains(5)) {
                                         if (collect.contains(2) && (templateNode.getHtmlUrl() == null || templateNode.getInitTableName() == null || templateNode.getExcelId() == null)) {
                                             errorMsg.append(editContractNode.getNodeName() + "(" + editContractNode.getPKeyId() + ")").append("未配置清表;");
-                                            continue;
-                                        }
-                                        editContractNode.setExcelId(templateNode.getExcelId());
-                                        editContractNode.setInitTableName(templateNode.getInitTableName());
-                                        editContractNode.setHtmlUrl(templateNode.getHtmlUrl());
-                                        if (templateNode.getExcelId() != null) {
-                                            editContractNode.setIsLinkTable(2);
+                                        }else{
+                                            editContractNode.setExcelId(templateNode.getExcelId());
+                                            editContractNode.setInitTableName(templateNode.getInitTableName());
+                                            editContractNode.setHtmlUrl(templateNode.getHtmlUrl());
+                                            if (templateNode.getExcelId() != null) {
+                                                editContractNode.setIsLinkTable(2);
+                                            }
                                         }
                                     }
                                     //排序