Browse Source

api接口-计量-获取某一合同段的分部分项划分
1、交工证书判断调整为major_data_type = 3且全部已审批

LHB 4 days ago
parent
commit
94c55b2ec7

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

@@ -4385,8 +4385,13 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
                     .collect(Collectors.toSet());
 
             // 交工证书判断
-            vo.setCompletionCertificate(children.stream()
-                    .anyMatch(node -> node.getMajorDataType() != null && node.getMajorDataType() == 3));
+            List<Long> completionCertificate = children.stream()
+                    .filter(node -> node.getMajorDataType() != null && node.getMajorDataType() == 2)
+                    .map(WbsTreeContract::getPKeyId)
+                    .collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(completionCertificate)) {
+                vo.setCompletionCertificate(allQueryIds.containsAll(completionCertificate));
+            }
 
             // 附件报告判断
             vo.setStrengthReportSeven(childrenIds.stream().anyMatch(id ->