Commit 78f3b3615a772af74bc77a92c72b2acc4ccbbd30
Merge remote-tracking branch 'origin/dev' into test
Showing
1 changed file
with
8 additions
and
8 deletions
fw-shirasawa-dao/src/main/resources/mapper/FollowRecordMapper.xml
... | ... | @@ -137,15 +137,15 @@ |
137 | 137 | <if test=" condition.dataDate != null"> |
138 | 138 | and ( |
139 | 139 | DATE_FORMAT(t1.plan_time, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') |
140 | - or DATE_FORMAT(t1.deadline, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') | |
141 | - or DATE_FORMAT(t1.follow_time, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') | |
140 | + or (DATE_FORMAT(t1.deadline, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') and out_time = 3) | |
141 | + or (DATE_FORMAT(t1.follow_time, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') and out_time = 1) | |
142 | 142 | ) |
143 | 143 | </if> |
144 | 144 | <if test=" condition.dataDate == null"> |
145 | 145 | and ( |
146 | 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') | |
147 | + or (DATE_FORMAT(t1.deadline, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d') and out_time = 3) | |
148 | + or (DATE_FORMAT(t1.follow_time, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d') and out_time = 1) | |
149 | 149 | ) |
150 | 150 | </if> |
151 | 151 | </where> |
... | ... | @@ -209,15 +209,15 @@ |
209 | 209 | <if test=" condition.dataDate != null"> |
210 | 210 | and ( |
211 | 211 | DATE_FORMAT(t1.plan_time, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') |
212 | - or DATE_FORMAT(t1.deadline, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') | |
213 | - or DATE_FORMAT(t1.follow_time, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') | |
212 | + or (DATE_FORMAT(t1.deadline, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') and out_time = 3) | |
213 | + or (DATE_FORMAT(t1.follow_time, '%Y-%m') = DATE_FORMAT(#{condition.dataDate}, '%Y-%m') and out_time = 1) | |
214 | 214 | ) |
215 | 215 | </if> |
216 | 216 | <if test=" condition.dataDate == null"> |
217 | 217 | and ( |
218 | 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') | |
219 | + or (DATE_FORMAT(t1.deadline, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d') and out_time = 3) | |
220 | + or (DATE_FORMAT(t1.follow_time, '%Y-%m-%d') = DATE_FORMAT(now(), '%Y-%m-%d') and out_time = 1) | |
221 | 221 | ) |
222 | 222 | </if> |
223 | 223 | </where> | ... | ... |