diff --git a/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java b/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java index a216271..32597b4 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/ActivityScheduleController.java @@ -1,5 +1,7 @@ package com.kiisoo.ic.activity.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.kiisoo.ic.activity.bean.ActivityScheduleVO; import com.kiisoo.ic.activity.entity.PmnActivitySchedule; import com.kiisoo.ic.activity.mapper.PmnActivityInstanceDOMapper; @@ -40,9 +42,13 @@ public class ActivityScheduleController extends BaseController { @ApiOperation(value = "所有活动池列表") @GetMapping(value = "/list/all") - public Map listAll() { + public Map listAll(String categoryCode) { try { - List list = pmnActivityScheduleDOMapper.selectList(null); + LambdaQueryWrapper wrapper = null; + if(categoryCode != null) { + wrapper = Wrappers.lambdaQuery().eq(PmnActivitySchedule::getCategoryCode, categoryCode); + } + List list = pmnActivityScheduleDOMapper.selectList(wrapper); return data(list); } catch (Exception e) { log.error("查询出错", e); diff --git a/src/main/java/com/kiisoo/ic/activity/entity/PmnActivitySchedule.java b/src/main/java/com/kiisoo/ic/activity/entity/PmnActivitySchedule.java index 28fb32d..dabcb43 100644 --- a/src/main/java/com/kiisoo/ic/activity/entity/PmnActivitySchedule.java +++ b/src/main/java/com/kiisoo/ic/activity/entity/PmnActivitySchedule.java @@ -25,6 +25,8 @@ public class PmnActivitySchedule { private Integer categoryId = 0; + private String categoryCode; + private Date createTime; private Date updateTime;