|
|
@@ -3448,21 +3448,21 @@ public class WbsTreeContractServiceImpl extends BaseServiceImpl<WbsTreeContractM
|
|
|
|
|
|
@Override
|
|
|
public boolean checkNodeAllDate(WbsTreeContract contract) {
|
|
|
- List<Integer> tableOwners = new ArrayList<>();
|
|
|
- if (StringUtils.isEmpty(contract.getTableOwner())) {
|
|
|
- tableOwners.add(1);
|
|
|
- tableOwners.add(2);
|
|
|
- tableOwners.add(3);
|
|
|
- } else if (contract.getTableOwner().contains("1") || contract.getTableOwner().contains("2") || contract.getTableOwner().contains("3")) {
|
|
|
- tableOwners.add(1);
|
|
|
- tableOwners.add(2);
|
|
|
- tableOwners.add(3);
|
|
|
- } else {
|
|
|
- tableOwners.add(4);
|
|
|
- tableOwners.add(5);
|
|
|
- tableOwners.add(6);
|
|
|
- }
|
|
|
- List<WbsTreeContract> list = baseMapper.selectList(new LambdaQueryWrapper<>(WbsTreeContract.class).eq(WbsTreeContract::getPId, contract.getPKeyId()).in(WbsTreeContract::getTableOwner, tableOwners).ne(WbsTreeContract::getIsBussShow, 2));
|
|
|
+// List<Integer> tableOwners = new ArrayList<>();
|
|
|
+// if (StringUtils.isEmpty(contract.getTableOwner())) {
|
|
|
+// tableOwners.add(1);
|
|
|
+// tableOwners.add(2);
|
|
|
+// tableOwners.add(3);
|
|
|
+// } else if (contract.getTableOwner().contains("1") || contract.getTableOwner().contains("2") || contract.getTableOwner().contains("3")) {
|
|
|
+// tableOwners.add(1);
|
|
|
+// tableOwners.add(2);
|
|
|
+// tableOwners.add(3);
|
|
|
+// } else {
|
|
|
+// tableOwners.add(4);
|
|
|
+// tableOwners.add(5);
|
|
|
+// tableOwners.add(6);
|
|
|
+// }
|
|
|
+ List<WbsTreeContract> list = baseMapper.selectList(new LambdaQueryWrapper<>(WbsTreeContract.class).eq(WbsTreeContract::getPId, contract.getPKeyId()).ne(WbsTreeContract::getIsBussShow, 2));//.in(WbsTreeContract::getTableOwner, tableOwners);
|
|
|
if (!list.isEmpty()) {
|
|
|
boolean b = list.stream().anyMatch(w -> w.getDateIsComplete() != null && w.getDateIsComplete() == 2);
|
|
|
String ancestorsPId = contract.getAncestorsPId();
|