Commit bfc3047abd48ea1d354f7fef0635cbb6e6f3369c
1 parent
d6c5c380
bug 修复
Showing
2 changed files
with
7 additions
and
2 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
@@ -211,7 +211,8 @@ | @@ -211,7 +211,8 @@ | ||
211 | </foreach> | 211 | </foreach> |
212 | </if> | 212 | </if> |
213 | <if test="condition.userId !=null"> | 213 | <if test="condition.userId !=null"> |
214 | - and t1.follow_user = #{condition.userId} | 214 | + and (t1.follow_user = #{condition.userId} |
215 | + or t1.finish_user = #{condition.userId}) | ||
215 | </if> | 216 | </if> |
216 | and DATE(t1.close_time) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND | 217 | and DATE(t1.close_time) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND |
217 | DATE(from_unixtime(#{condition.endTime})) | 218 | DATE(from_unixtime(#{condition.endTime})) |
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/FollowApiBizService.kt
@@ -83,7 +83,7 @@ class FollowApiBizService( | @@ -83,7 +83,7 @@ class FollowApiBizService( | ||
83 | followTypeEnum.value | 83 | followTypeEnum.value |
84 | ) | 84 | ) |
85 | val dtoList = clueTaskService.queryShouldBeCompleted(search) | 85 | val dtoList = clueTaskService.queryShouldBeCompleted(search) |
86 | - return dtoList.map { | 86 | + val resultList = dtoList.map { |
87 | ShouldBeCompletedResult( | 87 | ShouldBeCompletedResult( |
88 | it.vin, | 88 | it.vin, |
89 | it.userId, | 89 | it.userId, |
@@ -92,6 +92,10 @@ class FollowApiBizService( | @@ -92,6 +92,10 @@ class FollowApiBizService( | ||
92 | it.state | 92 | it.state |
93 | ) | 93 | ) |
94 | } | 94 | } |
95 | + if (Objects.nonNull(query.userId)) { | ||
96 | + return resultList.filter { it.userId == query.userId } | ||
97 | + } | ||
98 | + return resultList | ||
95 | } | 99 | } |
96 | 100 | ||
97 | fun queryAccidentFollowerByPlate(plateNo: String, groupId: Long): ClueTask? { | 101 | fun queryAccidentFollowerByPlate(plateNo: String, groupId: Long): ClueTask? { |