Commit 26db18634d4684cd52639c8b2d2f5716972cd398
1 parent
e442ad67
fix(*): 处理测试数据bug修复
- 处理测试数据bug修复
Showing
1 changed file
with
1 additions
and
17 deletions
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; |
25 | 25 | import cn.fw.shirasawa.rpc.oop.OopService; |
26 | 26 | import cn.fw.shirasawa.rpc.oop.dto.ShopDTO; |
27 | 27 | import cn.fw.shirasawa.rpc.pstn.PstnRpcService; |
28 | -import cn.fw.shirasawa.sdk.enums.BusinessTypeEnum; | |
29 | 28 | import cn.fw.shirasawa.service.data.*; |
30 | 29 | import cn.fw.shirasawa.service.event.CancelApproveEvent; |
31 | 30 | import cn.fw.shirasawa.service.event.RecordCompleteEvent; |
... | ... | @@ -302,23 +301,8 @@ public abstract class AbstractFollowStrategy implements FollowStrategy { |
302 | 301 | |
303 | 302 | @Override |
304 | 303 | public List<FollowRecordHistoryVO> queryHistoryByRecord(FollowRecord record) { |
305 | - List<FollowRecordHistoryVO> list = new ArrayList<>(); | |
306 | - if (BusinessTypeEnum.AS.equals(record.getBizType()) && !FollowTypeEnum.AC.equals(record.getType()) && !FollowTypeEnum.AF.equals(record.getType())) { | |
307 | - List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery() | |
308 | - .eq(FollowTask::getType, record.getType()) | |
309 | - .eq(FollowTask::getBizId, record.getBizId()) | |
310 | - .eq(FollowTask::getGroupId, record.getGroupId()) | |
311 | - .ge(FollowTask::getCloseTime, LocalDateTime.now().minusMonths(2L)) | |
312 | - .ne(FollowTask::getId, record.getTaskId()) | |
313 | - ); | |
314 | - if (!CollectionUtils.isEmpty(taskList)) { | |
315 | - for (FollowTask followTask : taskList) { | |
316 | - list.addAll(queryHistoryByTask(followTask)); | |
317 | - } | |
318 | - } | |
319 | - } | |
320 | 304 | FollowTask task = followTaskService.getById(record.getTaskId()); |
321 | - list.addAll(queryHistoryByTask(task)); | |
305 | + List<FollowRecordHistoryVO> list = new ArrayList<>(queryHistoryByTask(task)); | |
322 | 306 | return list.stream().sorted((a, b) -> b.getId().compareTo(a.getId())).collect(Collectors.toList()); |
323 | 307 | } |
324 | 308 | ... | ... |