From 0fdee57344da66bcaff04f44b3198c893562599b Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 21 Oct 2019 18:21:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/invest/InvestDemandQuery.java | 2 +- .../invest/impl/InvestBizServiceImpl.java | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java b/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java index 2dfca0361..e6ff72e00 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestDemandQuery.java +++ b/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; } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index cf494a580..620a9646c 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/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 recordQueryWrapper = new LambdaQueryWrapper<>(); InvestDemandEntity demandEntity = null; + List demandRecord = new ArrayList<>(); if (Objects.equals(params.getRecordType(), EnumFollowType.DEMAND)) { InvestCustomerEntity customerEntity = customerService.getByIdNotNull(params.getTid()); demandEntity = demandService.getOne(new LambdaQueryWrapper().eq(InvestDemandEntity::getCustomerId, customerEntity.getId())); buildQueryWrapper(recordQueryWrapper, InvestOperateRecordEntity.TLB_CUSTOMER, customerEntity.getId()); + if (Objects.nonNull(demandEntity)) { + LambdaQueryWrapper 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 resultList = new ArrayList<>(); List recordPage = operateRecordService.list(recordQueryWrapper); + recordPage.addAll(demandRecord); if (CollectionUtils.isEmpty(recordPage)) { return resultList; } - - List demandRecord = new ArrayList<>(); - if (Objects.nonNull(demandEntity)) { - LambdaQueryWrapper demandQueryWrapper = new LambdaQueryWrapper<>(); - buildQueryWrapper(demandQueryWrapper, InvestOperateRecordEntity.TLB_DEMAND, demandEntity.getId()); - demandRecord.addAll(operateRecordService.list(demandQueryWrapper)); - } - - recordPage.addAll(demandRecord); List mixRecordPage = recordPage.parallelStream().sorted((o1, o2) -> { if (Objects.equals(o1.getCreateDate(), o2.getCreateDate())) { return 0;