|
|
|
@@ -306,7 +306,7 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
remindPageQuery.setQueryData(remindQuery); |
|
|
|
LambdaQueryWrapper<InvestRemindEntity> queryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
queryWrapper.ge(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getBeginDate, getDayStart(params.getRemindDate())); |
|
|
|
//queryWrapper.le(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); |
|
|
|
queryWrapper.ge(Objects.nonNull(params.getRemindDate()), InvestRemindEntity::getEndDate, getDayEnd(params.getRemindDate())); |
|
|
|
queryWrapper.orderByDesc(InvestRemindEntity::getCreateDate); |
|
|
|
InvestPageResult<InvestRemindEntity> recordPage = remindService.queryPage(remindPageQuery, queryWrapper); |
|
|
|
if (CollectionUtils.isEmpty(recordPage.getRecords())) { |
|
|
|
@@ -522,43 +522,28 @@ public class InvestBizServiceImpl implements InvestBizService { |
|
|
|
public InvestPageResult<InvestOperateRecordVo> findOperateListById(InvestOperateRecordQuery params) { |
|
|
|
InvestHelper.notNull(params, params.getRecordType(), params.getTid()); |
|
|
|
InvestPageResult<InvestOperateRecordVo> investPage = new InvestPageResult<>(); |
|
|
|
LambdaQueryWrapper<InvestOperateRecordEntity> recordQueryWrapper = new LambdaQueryWrapper<>(); |
|
|
|
InvestDemandEntity demandEntity; |
|
|
|
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)) { |
|
|
|
InvestPageResult<InvestOperateRecordEntity> entityPageList = operateRecordService.selectPageByTid(params); |
|
|
|
if (entityPageList.getSize() == 0) { |
|
|
|
return investPage; |
|
|
|
} |
|
|
|
List<InvestOperateRecordEntity> mixRecordPage = recordPage.parallelStream().sorted((o1, o2) -> { |
|
|
|
if (Objects.equals(o1.getCreateDate(), o2.getCreateDate())) { |
|
|
|
return 0; |
|
|
|
} else if (o1.getCreateDate().after(o2.getCreateDate())) { |
|
|
|
return 1; |
|
|
|
} else { |
|
|
|
return -1; |
|
|
|
} |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
|
|
|
|
Map<Long, MallUserInfo> usersMap = getMap(userInfoService.getByIds(getIds(mixRecordPage, InvestOperateRecordEntity::getOperator)), MallUserInfo::getId); |
|
|
|
for (InvestOperateRecordEntity recordEntity : mixRecordPage) { |
|
|
|
List<TableTriple> record = JSONArray.parseArray(recordEntity.getContent(), TableTriple.class); |
|
|
|
resultList.addAll(getRecordList(recordEntity, record, usersMap.get(recordEntity.getOperator()))); |
|
|
|
Collection<InvestOperateRecordEntity> recordList = entityPageList.getRecords(); |
|
|
|
Map<Long, MallUserInfo> usersMap = getMap(userInfoService.getByIds(getIds(recordList, InvestOperateRecordEntity::getOperator)), MallUserInfo::getId); |
|
|
|
|
|
|
|
List<InvestOperateRecordVo> resultList = new ArrayList<>(); |
|
|
|
for (InvestOperateRecordEntity recordEntity : recordList) { |
|
|
|
InvestOperateRecordVo itemVo = new InvestOperateRecordVo(); |
|
|
|
BeanUtils.copyProperties(recordEntity, itemVo); |
|
|
|
MallUserInfo userInfo = usersMap.get(recordEntity.getOperator()); |
|
|
|
if (Objects.nonNull(userInfo)) { |
|
|
|
itemVo.setOperatorName(userInfo.getName()); |
|
|
|
} |
|
|
|
TableTriple content = JSON.parseObject(recordEntity.getContent(), TableTriple.class); |
|
|
|
itemVo.setRecord(content); |
|
|
|
resultList.add(itemVo); |
|
|
|
} |
|
|
|
BeanUtils.copyProperties(entityPageList, investPage); |
|
|
|
investPage.setRecords(resultList); |
|
|
|
return investPage; |
|
|
|
} |
|
|
|
|
|
|
|
|