diff --git a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml index cf34587..38f9a5a 100644 --- a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml +++ b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml @@ -137,27 +137,11 @@ and t1.create_time <= #{condition.startTime2} - - and ( - t1.state = 2 - - and t1.close_time >= #{condition.completeTime1} - - - and t1.close_time <= #{condition.completeTime2} - - ) - - - and ( - t1.state = 3 - - and t1.close_time >= #{condition.defeatTime1} - - - and t1.close_time <= #{condition.defeatTime2} - - ) + + and t1.close_time >= #{closeTime1} + + + and t1.close_time <= #{closeTime2} and t1.state = #{condition.state}