|
|
@@ -156,8 +156,18 @@
|
|
|
and a.status =#{request.status}
|
|
|
</if>
|
|
|
<if test="request.moth !=null">
|
|
|
- AND( (a.plan_start_time <= #{request.planStartTime} OR a.plan_end_time>=#{request.planStartTime})
|
|
|
- OR (a.plan_start_time <= #{request.planEndTime} OR a.plan_end_time>=#{request.planEndTime}))
|
|
|
+ AND ((
|
|
|
+ #{request.planStartTime} <= a.plan_start_time
|
|
|
+ and #{request.planEndTime} >=a.plan_start_time
|
|
|
+ )
|
|
|
+ or (
|
|
|
+ #{request.planStartTime} <= a.plan_end_time
|
|
|
+ and #{request.planEndTime} >= a.plan_end_time
|
|
|
+ )
|
|
|
+ or (
|
|
|
+ #{request.planStartTime} >= a.plan_start_time
|
|
|
+ and #{request.planEndTime} <= a.plan_end_time
|
|
|
+ ))
|
|
|
</if>
|
|
|
AND a.role_id IN (SELECT role_id FROM sys_user_role WHERE user_id=#{request.retrievalUser})
|
|
|
GROUP BY
|