|
@@ -880,7 +880,7 @@ public class AgreementLogic {
|
|
|
|
|
|
if (!CollectionUtils.isEmpty(list)) {
|
|
if (!CollectionUtils.isEmpty(list)) {
|
|
workerPolicyService.lambdaUpdate()
|
|
workerPolicyService.lambdaUpdate()
|
|
- .ge(WorkerPolicy::getEndTime, DateUtil.beginOfDay(new Date()))
|
|
|
|
|
|
+ .ge(WorkerPolicy::getEndTime, DateUtil.offsetMinute(DateUtil.endOfDay(new Date()),-2))
|
|
.le(WorkerPolicy::getStartTime, new Date())
|
|
.le(WorkerPolicy::getStartTime, new Date())
|
|
.in(WorkerPolicy::getOrderId, list.stream().map(PolicyOrder::getId).collect(Collectors.toList()))
|
|
.in(WorkerPolicy::getOrderId, list.stream().map(PolicyOrder::getId).collect(Collectors.toList()))
|
|
.ne(WorkerPolicy::getStatus, PolicyOrderStatusEnum.BZZ.getKey())
|
|
.ne(WorkerPolicy::getStatus, PolicyOrderStatusEnum.BZZ.getKey())
|
|
@@ -890,7 +890,7 @@ public class AgreementLogic {
|
|
|
|
|
|
|
|
|
|
policyOrderService.lambdaUpdate()
|
|
policyOrderService.lambdaUpdate()
|
|
- .ge(PolicyOrder::getEndTime, DateUtil.beginOfDay(new Date()))
|
|
|
|
|
|
+ .ge(PolicyOrder::getEndTime, DateUtil.offsetMinute(DateUtil.endOfDay(new Date()),-2))
|
|
.le(PolicyOrder::getStartTime, new Date())
|
|
.le(PolicyOrder::getStartTime, new Date())
|
|
.ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
|
|
.ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.BZZ.getKey())
|
|
.ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey())
|
|
.ne(PolicyOrder::getPolicyOrderStatus, PolicyOrderStatusEnum.YSX.getKey())
|