Просмотр исходного кода

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
0fdee57344
2 измененных файлов: 8 добавлений и 10 удалений
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java
  2. +7
    -9
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java Просмотреть файл

@@ -29,7 +29,7 @@ public class InvestDemandQuery extends InvestPageQuery {
/**
* 负责人
*/
@io.swagger.annotations.ApiModelProperty(value = "负责人", name = "owner")
@io.swagger.annotations.ApiModelProperty(value = "负责人", name = "demandOwner")
private Long demandOwner;

}

+ 7
- 9
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Просмотреть файл

@@ -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;


Загрузка…
Отмена
Сохранить