Merge remote-tracking branch 'origin/feature/REQ-3982' into feature/REQ-3982
This commit is contained in:
commit
679a0c3bdc
@ -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())) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user