|
@@ -856,6 +856,7 @@ public class WorkerLogic {
|
|
|
.notIn(CollectionUtil.isEmpty(policyOrderList) && CollectionUtil.isNotEmpty(policyOrders), Policy::getId, policyIds)
|
|
|
.eq(Policy::getIsBuy, IsYesNoEnum.YES.getKey())
|
|
|
.le(Policy::getPolicyStartTime, new Date())
|
|
|
+ .eq(Policy::getType, "DS")
|
|
|
.ge(Policy::getEndTime, notEmpty?policyOrderList.get(0).getEndTime():new Date())
|
|
|
.in(Policy::getId, policyWebsits.stream().map(PolicyWebsit::getPolicyId).collect(Collectors.toList()))
|
|
|
.orderByAsc(Policy::getEndTime)
|