From 26db18634d4684cd52639c8b2d2f5716972cd398 Mon Sep 17 00:00:00 2001 From: Kurisu Date: Fri, 6 Jan 2023 09:05:26 +0800 Subject: [PATCH] fix(*): 处理测试数据bug修复 --- fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java b/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java index 6a1c561..5759ce8 100644 --- a/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java +++ b/fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java @@ -25,7 +25,6 @@ import cn.fw.shirasawa.rpc.member.dto.MemberUserDTO; import cn.fw.shirasawa.rpc.oop.OopService; import cn.fw.shirasawa.rpc.oop.dto.ShopDTO; import cn.fw.shirasawa.rpc.pstn.PstnRpcService; -import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum; import cn.fw.shirasawa.service.data.*; import cn.fw.shirasawa.service.event.CancelApproveEvent; import cn.fw.shirasawa.service.event.RecordCompleteEvent; @@ -302,23 +301,8 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { @Override public List queryHistoryByRecord(FollowRecord record) { - List list = new ArrayList<>(); - if (BusinessTypeEnum.AS.equals(record.getBizType()) && !FollowTypeEnum.AC.equals(record.getType()) && !FollowTypeEnum.AF.equals(record.getType())) { - List taskList = followTaskService.list(Wrappers.lambdaQuery() - .eq(FollowTask::getType, record.getType()) - .eq(FollowTask::getBizId, record.getBizId()) - .eq(FollowTask::getGroupId, record.getGroupId()) - .ge(FollowTask::getCloseTime, LocalDateTime.now().minusMonths(2L)) - .ne(FollowTask::getId, record.getTaskId()) - ); - if (!CollectionUtils.isEmpty(taskList)) { - for (FollowTask followTask : taskList) { - list.addAll(queryHistoryByTask(followTask)); - } - } - } FollowTask task = followTaskService.getById(record.getTaskId()); - list.addAll(queryHistoryByTask(task)); + List list = new ArrayList<>(queryHistoryByTask(task)); return list.stream().sorted((a, b) -> b.getId().compareTo(a.getId())).collect(Collectors.toList()); } -- libgit2 0.22.2