|
@@ -250,7 +250,7 @@
|
|
|
|
|
|
<if test="weeklyStatus !=null and weeklyStatus == 0">
|
|
|
AND a.weekly_status = #{weeklyStatus}
|
|
|
- and a.end_date <= #{endDate}
|
|
|
+ and (a.end_date <= #{endDate} or #{endDate} between a.begin_date and a.end_date )
|
|
|
</if>
|
|
|
<if test="weeklyStatus !=null and weeklyStatus == 1">
|
|
|
AND a.weekly_status = #{weeklyStatus}
|