Commit f943af3f70618509d9585c555678147dd80ec296
1 parent
a4a33c06
跟进池查询参数修改
Showing
1 changed file
with
5 additions
and
21 deletions
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
... | ... | @@ -137,27 +137,11 @@ |
137 | 137 | <if test="condition.startTime2 !=null"> |
138 | 138 | and t1.create_time <= #{condition.startTime2} |
139 | 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 | 145 | </if> |
162 | 146 | <if test="condition.state !=null"> |
163 | 147 | and t1.state = #{condition.state} | ... | ... |