|
@@ -179,10 +179,10 @@
|
|
|
WHERE vga.status_ = 'PROGRESS'
|
|
WHERE vga.status_ = 'PROGRESS'
|
|
|
AND vga.del_flag_ = 0 AND vga.course_type_ = #{activityQueryDto.courseType}
|
|
AND vga.del_flag_ = 0 AND vga.course_type_ = #{activityQueryDto.courseType}
|
|
|
AND FIND_IN_SET(#{activityQueryDto.organId},vga.organ_id_)
|
|
AND FIND_IN_SET(#{activityQueryDto.organId},vga.organ_id_)
|
|
|
- <if test="enable != null and enable == true">
|
|
|
|
|
|
|
+ <if test="activityQueryDto.enable != null and activityQueryDto.enable == true">
|
|
|
AND ((NOW() < vga.end_time_ AND NOW() > vga.start_time_) OR vga.end_time_ IS NULL)
|
|
AND ((NOW() < vga.end_time_ AND NOW() > vga.start_time_) OR vga.end_time_ IS NULL)
|
|
|
</if>
|
|
</if>
|
|
|
- <if test="enable != null and enable == false">
|
|
|
|
|
|
|
+ <if test="activityQueryDto.enable != null and activityQueryDto.enable == false">
|
|
|
AND (NOW() >= vga.end_time_ OR NOW() <= vga.start_time_)
|
|
AND (NOW() >= vga.end_time_ OR NOW() <= vga.start_time_)
|
|
|
</if>
|
|
</if>
|
|
|
<if test="activityQueryDto.categoryId != null">
|
|
<if test="activityQueryDto.categoryId != null">
|
zouxuan