diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml index 9945a43..a7897b6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml @@ -12,6 +12,7 @@ + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java index a00022b..09d67d8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java @@ -77,4 +77,11 @@ public class EventMockData implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "同比") private List data; + + /** + * 状态 0-无效 1-有效 + */ + @ApiModelProperty(value = "状态 0-无效 1-有效") + private String status; + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java index 3436ab1..cef7be9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java @@ -3,6 +3,8 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventMockDataMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; @@ -30,7 +32,9 @@ public class EventMockDataServiceImpl extends ServiceImpl getProfessionalDataList() { - List list = this.list(); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(EventMockData::getStatus, "1"); + List list = this.list(wrapper); List returnList = list.stream().filter(f -> StrUtil.isBlank(f.getParentClass()) ).collect(Collectors.toList()); Map> map = list.stream().filter(f -> StrUtil.isNotBlank(f.getParentClass())).collect(Collectors.groupingBy(EventMockData::getParentClass));