|
@@ -10,7 +10,7 @@ import java.util.List;
|
|
|
public interface ActivityPeriodMapper extends BaseMapper<ActivityPeriod> {
|
|
public interface ActivityPeriodMapper extends BaseMapper<ActivityPeriod> {
|
|
|
@Select("select asic.id, asic.activity_name, ap.start_time, ap.end_time from activity_period ap " +
|
|
@Select("select asic.id, asic.activity_name, ap.start_time, ap.end_time from activity_period ap " +
|
|
|
"left join activity_sign_in_config asic on asic.id = ap.activity_id " +
|
|
"left join activity_sign_in_config asic on asic.id = ap.activity_id " +
|
|
|
- "where asic.delete_flag = 0 and ap.delete_flag = 0 and ap.start_time < #{endTime} and ap.end_time > #{startTime}")
|
|
|
|
|
|
|
+ "where asic.delete_flag = 0 and ap.delete_flag = 0 and ap.start_time <= #{endTime} and ap.end_time >= #{startTime}")
|
|
|
List<ActivityPeriodVo> getActivityPeriodList(@Param("startTime") String startTime, @Param("endTime") String endTime);
|
|
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 " +
|
|
@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 " +
|
|
"left join activity_sign_in_config asic on asic.id = ap.activity_id " +
|