|
@@ -214,6 +214,10 @@
|
|
task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date >= #{startDate}
|
|
task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date >= #{startDate}
|
|
AND task.start_date <= #{endDate} AND task.end_date >= #{startDate} AND task.end_date <= #{endDate}
|
|
AND task.start_date <= #{endDate} AND task.end_date >= #{startDate} AND task.end_date <= #{endDate}
|
|
)
|
|
)
|
|
|
|
+ OR
|
|
|
|
+ (
|
|
|
|
+ task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date <= #{startDate} AND task.end_date > #{endDate}
|
|
|
|
+ )
|
|
)
|
|
)
|
|
</if>
|
|
</if>
|
|
<if test=" startDate != null and endDate == null">
|
|
<if test=" startDate != null and endDate == null">
|
|
@@ -319,6 +323,10 @@
|
|
task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date >= #{startDate}
|
|
task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date >= #{startDate}
|
|
AND task.start_date <= #{endDate} AND task.end_date >= #{startDate} AND task.end_date <= #{endDate}
|
|
AND task.start_date <= #{endDate} AND task.end_date >= #{startDate} AND task.end_date <= #{endDate}
|
|
)
|
|
)
|
|
|
|
+ OR
|
|
|
|
+ (
|
|
|
|
+ task.start_date IS NOT NULL AND task.end_date IS NOT NULL AND task.start_date <= #{startDate} AND task.end_date > #{endDate}
|
|
|
|
+ )
|
|
)
|
|
)
|
|
</if>
|
|
</if>
|
|
<if test=" startDate != null and endDate == null">
|
|
<if test=" startDate != null and endDate == null">
|