|
|
|
@@ -430,28 +430,26 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
InvestHelper.notNull(params, params.getRecordType(), params.getTid()); |
|
|
|
LambdaQueryWrapper<InvestOperateRecordEntity> recordQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
InvestDemandEntity demandEntity = null; |
|
|
|
List<InvestOperateRecordEntity> demandRecord = new ArrayList<>(); |
|
|
|
if (Objects.equals(params.getRecordType(), EnumFollowType.DEMAND)) { |
|
|
|
InvestCustomerEntity customerEntity = customerService.getByIdNotNull(params.getTid()); |
|
|
|
demandEntity = demandService.getOne(new LambdaQueryWrapper<InvestDemandEntity>().eq(InvestDemandEntity::getCustomerId, customerEntity.getId())); |
|
|
|
buildQueryWrapper(recordQueryWrapper, InvestOperateRecordEntity.TLB_CUSTOMER, customerEntity.getId()); |
|
|
|
if (Objects.nonNull(demandEntity)) { |
|
|
|
LambdaQueryWrapper<InvestOperateRecordEntity> demandQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
buildQueryWrapper(demandQueryWrapper, InvestOperateRecordEntity.TLB_DEMAND, demandEntity.getId()); |
|
|
|
demandRecord.addAll(operateRecordService.list(demandQueryWrapper)); |
|
|
|
} |
|
|
|
} else if (Objects.equals(params.getRecordType(), EnumFollowType.TASK)) { |
|
|
|
buildQueryWrapper(recordQueryWrapper, InvestOperateRecordEntity.TLB_TASK, params.getTid()); |
|
|
|
} |
|
|
|
|
|
|
|
Collection<InvestOperateRecordVo> resultList = new ArrayList<>(); |
|
|
|
List<InvestOperateRecordEntity> recordPage = operateRecordService.list(recordQueryWrapper); |
|
|
|
recordPage.addAll(demandRecord); |
|
|
|
if (CollectionUtils.isEmpty(recordPage)) { |
|
|
|
return resultList; |
|
|
|
} |
|
|
|
|
|
|
|
List<InvestOperateRecordEntity> demandRecord = new ArrayList<>(); |
|
|
|
if (Objects.nonNull(demandEntity)) { |
|
|
|
LambdaQueryWrapper<InvestOperateRecordEntity> demandQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
buildQueryWrapper(demandQueryWrapper, InvestOperateRecordEntity.TLB_DEMAND, demandEntity.getId()); |
|
|
|
demandRecord.addAll(operateRecordService.list(demandQueryWrapper)); |
|
|
|
} |
|
|
|
|
|
|
|
recordPage.addAll(demandRecord); |
|
|
|
List<InvestOperateRecordEntity> mixRecordPage = recordPage.parallelStream().sorted((o1, o2) -> { |
|
|
|
if (Objects.equals(o1.getCreateDate(), o2.getCreateDate())) { |
|
|
|
return 0; |
|
|
|
|