From bd528be93abc8487b8af2974f1a839d6d5e976e0 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 26 Jan 2021 18:39:04 +0800
Subject: [PATCH] 20200126
---
src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java | 7 +++----
src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java | 4 +++-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
index 5a9e4c0..a087b45 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/service/impl/DocumentaryServiceImpl.java
@@ -176,16 +176,15 @@
String labels = followTraderInfoEntity.getLabels();
if(StrUtil.isNotEmpty(labels)) {
- String labelsName = "";
+ ArrayList<FollowTraderLabelEntity> arrayList = new ArrayList<>();
String[] split = labels.split(",");
int length = split.length;
for(int i = 0;i < length;i++) {
String string = split[i];
FollowTraderLabelEntity selectById = followTraderLabelDao.selectById(Long.parseLong(string));
- String labelsNames = selectById.getLabels();
- labelsName += (labelsNames + ",");
+ arrayList.add(selectById);
}
- FollowTraderProfitInfoVo.setLabels(labelsName);
+ FollowTraderProfitInfoVo.setLabels(arrayList);
}
}
diff --git a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
index 1b24b68..2dacc51 100644
--- a/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
+++ b/src/main/java/com/xcong/excoin/modules/documentary/vo/FollowTraderProfitInfoVo.java
@@ -1,8 +1,10 @@
package com.xcong.excoin.modules.documentary.vo;
import java.math.BigDecimal;
+import java.util.List;
import com.xcong.excoin.common.system.base.BaseEntity;
+import com.xcong.excoin.modules.documentary.entity.FollowTraderLabelEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -76,7 +78,7 @@
* 标签
*/
@ApiModelProperty("标签")
- private String labels;
+ private List<FollowTraderLabelEntity> labels;
/**
* 是否满员 1-是2-否
*/
--
Gitblit v1.9.1