valhalla / fw-shirasawa

Commit ac29379d85a2949d3f15d520cde1ec1d5f16860b

Authored by 张志伟
2 parents c571fa6d 6b926722

Merge remote-tracking branch 'origin/dev' into test

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
fw-shirasawa-server/src/main/java/cn/fw/shirasawa/server/controller/task/FollowRecordTask.java
  View file @ac29379
... ... @@ -79,7 +79,7 @@ public class FollowRecordTask {
79 79 List<FollowRecord> list = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
80 80 .eq(FollowRecord::getOutTime, Boolean.FALSE)
81 81 .eq(FollowRecord::getAddTodo, Boolean.FALSE)
82   - .ne(FollowRecord::getType, FollowTypeEnum.AC)
  82 + .notIn(FollowRecord::getType, FollowTypeEnum.AC, FollowTypeEnum.CF, FollowTypeEnum.PF)
83 83 .le(FollowRecord::getPlanTime, LocalDateTime.now())
84 84 .last("limit 0,500")
85 85 );
... ... @@ -95,8 +95,8 @@ public class FollowRecordTask {
95 95 public void push2AccTodo() {
96 96 List<FollowRecord> list = followRecordService.list(Wrappers.<FollowRecord>lambdaQuery()
97 97 .eq(FollowRecord::getOutTime, Boolean.FALSE)
98   - .eq(FollowRecord::getType, FollowTypeEnum.AC)
99 98 .eq(FollowRecord::getAddTodo, Boolean.FALSE)
  99 + .in(FollowRecord::getType, FollowTypeEnum.AC, FollowTypeEnum.CF, FollowTypeEnum.PF)
100 100 .le(FollowRecord::getPlanTime, LocalDateTime.now())
101 101 .last("limit 0,50")
102 102 );
... ...