Commit 6976da63a2792eeb960fb8d6abc2f5ae53503ed3
1 parent
aba2703f
feat(*): bug修复
- bug修复
Showing
2 changed files
with
2 additions
and
1 deletions
fw-valhalla-dao/src/main/java/cn/fw/valhalla/dao/mapper/ClueTaskMapper.java
... | ... | @@ -51,7 +51,7 @@ public interface ClueTaskMapper extends BaseMapper<ClueTask> { |
51 | 51 | List<ShouldBeCompletedDTO> queryBeCompleted(@Param("condition") BeCompletedQuery query); |
52 | 52 | |
53 | 53 | @Select("<script>" + |
54 | - "SELECT max(id) FROM clue_task WHERE (reason not in (4) or reason is null) and clue_id IN" + | |
54 | + "SELECT max(id) FROM clue_task WHERE clue_id IN" + | |
55 | 55 | "<foreach collection='clueIdList' item='id' index='index' open='(' close=')' separator=','>" + |
56 | 56 | "#{id}" + |
57 | 57 | "</foreach>" + | ... | ... |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java
... | ... | @@ -244,6 +244,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy { |
244 | 244 | } |
245 | 245 | |
246 | 246 | followClue.setClueState(ClueStatusEnum.COMPLETE); |
247 | + followClue.setCloseTime(DateUtil.date2LocalDateTime(originalData.getGenerateTime())); | |
247 | 248 | clueTask.setState(TaskStateEnum.COMPLETE); |
248 | 249 | clueTask.setCloseTime(DateUtil.date2LocalDateTime(originalData.getGenerateTime())); |
249 | 250 | clueTask.setFinishUser(originalData.getUserId()); | ... | ... |