|
@@ -440,11 +440,11 @@ public class PurchaseManage { |
|
|
.orderByDesc(Purchase::getCreateOn); |
|
|
.orderByDesc(Purchase::getCreateOn); |
|
|
if (!Boolean.FALSE.equals(req.getDisplay())) { |
|
|
if (!Boolean.FALSE.equals(req.getDisplay())) { |
|
|
query.and(q1 -> q1.eq(Purchase::getBidType, BidTypeEnum.BUILD_APP.getCode()) |
|
|
query.and(q1 -> q1.eq(Purchase::getBidType, BidTypeEnum.BUILD_APP.getCode()) |
|
|
.or(q2 -> q2.exists(String.format("select 1 from nd_operation no" + |
|
|
|
|
|
|
|
|
.or(q2 -> q2.exists(String.format("select 1 from nd_project_operation no" + |
|
|
" where no.bid_id = nd_purchase.id and no.%s is not null", actualTimeColumn)))); |
|
|
" where no.bid_id = nd_purchase.id and no.%s is not null", actualTimeColumn)))); |
|
|
} else { |
|
|
} else { |
|
|
query.and(q1 -> q1.ne(Purchase::getBidType, BidTypeEnum.BUILD_APP.getCode()) |
|
|
query.and(q1 -> q1.ne(Purchase::getBidType, BidTypeEnum.BUILD_APP.getCode()) |
|
|
.or(q2 -> q2.exists(String.format("select 1 from nd_operation no" + |
|
|
|
|
|
|
|
|
.or(q2 -> q2.exists(String.format("select 1 from nd_project_operation no" + |
|
|
" where no.bid_id = nd_purchase.id and no.%s is null", actualTimeColumn)))); |
|
|
" where no.bid_id = nd_purchase.id and no.%s is null", actualTimeColumn)))); |
|
|
} |
|
|
} |
|
|
UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); |
|
|
UserFullInfoDTO user = userInfoHelper.getUserFullInfo(LoginUserUtil.getUserId()); |
|
|