Commit b6ca8797 by 吕明尚

Merge branch 'refs/heads/dev' into test

parents b49b21af 5d247ea5
...@@ -152,6 +152,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i ...@@ -152,6 +152,7 @@ public class ActivityServiceImpl extends ServiceImpl<ActivityMapper, Activity> i
} }
// List<Activity> activities = selectActivityList(activity); // List<Activity> activities = selectActivityList(activity);
queryWrapper.eq(Activity::getIsOpen, YesNoEnum.yes.getIndex());
List<Activity> activities = list(queryWrapper); List<Activity> activities = list(queryWrapper);
CronParser cronParser = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.QUARTZ)); CronParser cronParser = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(CronType.QUARTZ));
Map<Date, List<Activity>> map = new HashMap<>(); Map<Date, List<Activity>> map = new HashMap<>();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment