Commit aa64eed63f52e16f00aa0e18d1c7b483c67aeedd
Merge remote-tracking branch 'origin/dev' into test
Showing
1 changed file
with
5 additions
and
21 deletions
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
| @@ -137,27 +137,11 @@ | @@ -137,27 +137,11 @@ | ||
| 137 | <if test="condition.startTime2 !=null"> | 137 | <if test="condition.startTime2 !=null"> |
| 138 | and t1.create_time <= #{condition.startTime2} | 138 | and t1.create_time <= #{condition.startTime2} |
| 139 | </if> | 139 | </if> |
| 140 | - <if test="condition.completeTime1 !=null or condition.completeTime2 !=null"> | ||
| 141 | - and ( | ||
| 142 | - t1.state = 2 | ||
| 143 | - <if test="condition.completeTime1 !=null"> | ||
| 144 | - and t1.close_time >= #{condition.completeTime1} | ||
| 145 | - </if> | ||
| 146 | - <if test="condition.completeTime2 !=null"> | ||
| 147 | - and t1.close_time <= #{condition.completeTime2} | ||
| 148 | - </if> | ||
| 149 | - ) | ||
| 150 | - </if> | ||
| 151 | - <if test="condition.defeatTime1 !=null or condition.defeatTime2 !=null"> | ||
| 152 | - and ( | ||
| 153 | - t1.state = 3 | ||
| 154 | - <if test="condition.defeatTime1 !=null"> | ||
| 155 | - and t1.close_time >= #{condition.defeatTime1} | ||
| 156 | - </if> | ||
| 157 | - <if test="condition.defeatTime2 !=null"> | ||
| 158 | - and t1.close_time <= #{condition.defeatTime2} | ||
| 159 | - </if> | ||
| 160 | - ) | 140 | + <if test="condition.closeTime1 !=null"> |
| 141 | + and t1.close_time >= #{closeTime1} | ||
| 142 | + </if> | ||
| 143 | + <if test="condition.closeTime2 !=null"> | ||
| 144 | + and t1.close_time <= #{closeTime2} | ||
| 161 | </if> | 145 | </if> |
| 162 | <if test="condition.state !=null"> | 146 | <if test="condition.state !=null"> |
| 163 | and t1.state = #{condition.state} | 147 | and t1.state = #{condition.state} |