|
@@ -720,7 +720,7 @@ public class WbsSynchronousServiceImpl {
|
|
|
} else {
|
|
|
if (i == 0) {
|
|
|
isSync = false;
|
|
|
- errorMsg.append(editContractNode.getNodeName() + "( " + editContractNode.getPKeyId() + ")").append("未填报;");
|
|
|
+ errorMsg.append(editContractNode.getNodeName() + "(" + editContractNode.getPKeyId() + ")").append("未填报;");
|
|
|
}
|
|
|
if (contractRanges.contains(WbsSyncTypeEnum.ALREADY_FILLED_IN_NOT_REPORTED.code) && (submit == null || submit == 0)) {
|
|
|
//已填报-未上报 102
|
|
@@ -728,7 +728,7 @@ public class WbsSynchronousServiceImpl {
|
|
|
} else {
|
|
|
if (submit == null) {
|
|
|
isSync = false;
|
|
|
- errorMsg.append(editContractNode.getNodeName() + "( " + editContractNode.getPKeyId() + ")").append("未上报;");
|
|
|
+ errorMsg.append(editContractNode.getNodeName() + "(" + editContractNode.getPKeyId() + ")").append("未上报;");
|
|
|
}else{
|
|
|
if (submit == 1 && contractRanges.contains(WbsSyncTypeEnum.PENDING_APPROVAL.code)) {
|
|
|
//待审批 104
|
|
@@ -765,6 +765,10 @@ 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());
|