valhalla / fw-shirasawa

Commit 5a0745fc7e12a4eef5d7ef6473ddccdce797a3fe

Authored by 张志伟
2 parents c1f832d1 594901b2

Merge remote-tracking branch 'origin/test'

Inline Side-by-side
Showing 2 changed files with 7 additions and 7 deletions
fw-shirasawa-dao/src/main/resources/mapper/FollowRecordMapper.xml
  View file @5a0745f
... ... @@ -143,9 +143,9 @@
143 143 </if>
144 144 <if test=" condition.dataDate == null">
145 145 and (
146   - DATE_FORMAT(t1.plan_time, '%Y-%m-%d') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m-%d')
147   - or DATE_FORMAT(t1.deadline, '%Y-%m-%d') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m-%d')
148   - or DATE_FORMAT(t1.follow_time, '%Y-%m-%d') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m-%d')
  146 + DATE_FORMAT(t1.plan_time, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
  147 + or DATE_FORMAT(t1.deadline, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
  148 + or DATE_FORMAT(t1.follow_time, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
149 149 )
150 150 </if>
151 151 </where>
... ... @@ -215,9 +215,9 @@
215 215 </if>
216 216 <if test=" condition.dataDate == null">
217 217 and (
218   - DATE_FORMAT(t1.plan_time, '%Y-%m-%d') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m-%d')
219   - or DATE_FORMAT(t1.deadline, '%Y-%m-%d') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m-%d')
220   - or DATE_FORMAT(t1.follow_time, '%Y-%m-%d') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m-%d')
  218 + DATE_FORMAT(t1.plan_time, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
  219 + or DATE_FORMAT(t1.deadline, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
  220 + or DATE_FORMAT(t1.follow_time, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d')
221 221 )
222 222 </if>
223 223 </where>
... ...
fw-shirasawa-service/src/main/java/cn/fw/shirasawa/service/bus/follow/strategy/AbstractFollowStrategy.java
  View file @5a0745f
... ... @@ -701,7 +701,7 @@ public abstract class AbstractFollowStrategy implements FollowStrategy {
701 701 }
702 702 }
703 703 }
704   - if (CollectionUtil.isEmpty(clueIds)) {
  704 + if (CollectionUtil.isNotEmpty(clueIds)) {
705 705 List<FollowTask> taskList = followTaskService.list(Wrappers.<FollowTask>lambdaQuery()
706 706 .in(FollowTask::getClueId, clueIds)
707 707 .in(FollowTask::getState, TaskStateEnum.ONGOING)
... ...