liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat_partyMemberEvent' into uat_code

Browse Source
This commit is contained in:
517612449@qq.com
2022-06-29 10:10:17 +08:00
parent ba5126f0e6 d316e23941
commit 26057004f2
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/dao/mapper/EventMockDataMapper.xml
View File

@ -12,6 +12,7 @@
<result column="data_type" jdbcType="VARCHAR" property="dataType"/>
<result column="data_name" jdbcType="VARCHAR" property="dataName"/>
<result column="data_compare" jdbcType="VARCHAR" property="dataCompare"/>
<result column="status" jdbcType="VARCHAR" property="status"/>
</resultMap>

7
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMockData.java
View File

@ -77,4 +77,11 @@ public class EventMockData implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "同比")
private List<MockDataValue> data;
/**
* 状态 0-无效 1-有效
*/
@ApiModelProperty(value = "状态 0-无效 1-有效")
private String status;
}

6
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java
View File

@ -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<EventMockDataMapper, E
@Override
public List<EventMockData> getProfessionalDataList() {
List<EventMockData> list = this.list();
LambdaQueryWrapper<EventMockData> wrapper = Wrappers.lambdaQuery();
wrapper.eq(EventMockData::getStatus, "1");
List<EventMockData> list = this.list(wrapper);
List<EventMockData> returnList = list.stream().filter(f -> StrUtil.isBlank(f.getParentClass()) ).collect(Collectors.toList());
Map<String, List<EventMockData>> map = list.stream().filter(f -> StrUtil.isNotBlank(f.getParentClass())).collect(Collectors.groupingBy(EventMockData::getParentClass));