|
@@ -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 ->
|