|
@ -91,8 +91,11 @@ |
|
|
<if test='null != serviceMatter and "" != serviceMatter'> |
|
|
<if test='null != serviceMatter and "" != serviceMatter'> |
|
|
AND sr.SERVICE_MATTER = #{serviceMatter} |
|
|
AND sr.SERVICE_MATTER = #{serviceMatter} |
|
|
</if> |
|
|
</if> |
|
|
<if test=" null != startTime and null != endTime"> |
|
|
<if test=" null != startTime"> |
|
|
AND a.ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime} |
|
|
AND a.ACTIVITY_TIME >= #{startTime} |
|
|
|
|
|
</if> |
|
|
|
|
|
<if test=" null != endTime"> |
|
|
|
|
|
AND a.ACTIVITY_TIME <= #{endTime} |
|
|
</if> |
|
|
</if> |
|
|
GROUP BY a.id |
|
|
GROUP BY a.id |
|
|
ORDER BY a.ACTIVITY_TIME DESC |
|
|
ORDER BY a.ACTIVITY_TIME DESC |
|
|