|
@ -89,11 +89,8 @@ |
|
|
<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 startTime != '' "> |
|
|
<if test=" null != startTime and startTime != '' and null != endTime and endTime != ''"> |
|
|
AND a.ACTIVITY_TIME <![CDATA[ >= ]]> #{startTime} |
|
|
AND a.ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime} |
|
|
</if> |
|
|
|
|
|
<if test="null != endTime and endTime != '' "> |
|
|
|
|
|
AND a.ACTIVITY_TIME <![CDATA[ <= ]]> #{endTime} |
|
|
|
|
|
</if> |
|
|
</if> |
|
|
GROUP BY a.id |
|
|
GROUP BY a.id |
|
|
ORDER BY a.ACTIVITY_TIME DESC |
|
|
ORDER BY a.ACTIVITY_TIME DESC |
|
|