Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into ...

Helius

2021-01-27 ea326544dc2b289156cdfc0c272cb5a5dda4164b

Merge branch 'whole_new' of https://gitee.com/chonggaoxiao/new_excoin into whole_new

 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));

                        labelsName = selectById.getLabels();

                        labelsName += (labelsName + ",");

                        arrayList.add(selectById);

                    }

                    FollowTraderProfitInfoVo.setLabels(labelsName);

                    FollowTraderProfitInfoVo.setLabels(arrayList);

                }

                

            }

@@ -194,7 +193,7 @@
    }

    

    public static void main(String[] args) {

        String labels = "";

        String labels = "1,2,3";

        if(StrUtil.isNotEmpty(labels)) {

            String labelsName = "";

            String[] split = labels.split(",");


 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-否

     */