Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982

This commit is contained in:
yanglin 2025-04-27 15:19:21 +08:00
commit 679a0c3bdc

View File

@ -1147,7 +1147,6 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
}
if (CollectionUtils.isNotEmpty(filter.getApproveCompletedDate())) {
queryChainWrapper.between(ChangeRecord::getApprovalCompleteTime, filter.getApproveCompletedDate().get(0), filter.getApproveCompletedDate().get(1));
queryChainWrapper.eq(ChangeRecord::getStatus, VisaStatusEnum.APPROVING);
queryChainWrapper.eq(ChangeRecord::getApprovalStatus, BpmnProcessInstanceResultEnum.APPROVED.getStatus());
}
if (CollectionUtils.isNotEmpty(filter.getApprovalCompleteTimePay())) {