|
|
@@ -14,6 +14,6 @@ public interface ActivityPeriodMapper extends BaseMapper<ActivityPeriod> {
|
|
|
List<ActivityPeriodVo> getActivityPeriodList(@Param("startTime") String startTime, @Param("endTime") String endTime);
|
|
|
@Select("select ap.id,ap.activity_id,asic.activity_name,asic.plan_config_type from activity_period ap " +
|
|
|
"left join activity_sign_in_config asic on asic.id = ap.activity_id " +
|
|
|
- "where ap.delete_flag = 0 and asic.delete_flag = 0 and asic.status = 1 and ap.start_time < CURDATE() and ap.end_time > CURDATE()")
|
|
|
+ "where ap.delete_flag = 0 and asic.delete_flag = 0 and asic.status = 1 and ap.start_time <= CURDATE() and ap.end_time >= CURDATE()")
|
|
|
List<ActivityPeriodVo> getCurrentActivityPeriodList();
|
|
|
}
|