From 7bf394c43fc2e4a4e71d72c1f84af75b717dddd8 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 22 Mar 2021 15:32:43 +0800 Subject: [PATCH] 20210319 平仓加载中 --- src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java | 3 +++ src/main/resources/templates/febs/views/modules/trademanage/positionSetting.html | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java index ae89ee6..3f40a6e 100644 --- a/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/trademanage/service/impl/TradeManageServiceImpl.java @@ -39,6 +39,7 @@ import com.xcong.excoin.modules.trademanage.vo.PositionSettingVo; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; @@ -1219,6 +1220,8 @@ } positionSettingVo.setSumRewardAmount(sumRewardAmount); } + CollUtil.sortByProperty(records, "sumRewardAmount"); + //CollUtil.sortByProperty(records, "accountType"); } return positionSettingVoIPage; } diff --git a/src/main/resources/templates/febs/views/modules/trademanage/positionSetting.html b/src/main/resources/templates/febs/views/modules/trademanage/positionSetting.html index df70f6e..6ca5108 100644 --- a/src/main/resources/templates/febs/views/modules/trademanage/positionSetting.html +++ b/src/main/resources/templates/febs/views/modules/trademanage/positionSetting.html @@ -111,13 +111,14 @@ id: 'userTable', url: ctx + 'tradeManage/positionSetting', totalRow: true, + initSort: {field:'createTime', type:'desc'}, cols: [[ {field: 'phone', title: '账号',minWidth: 100,align:'left',totalRowText: '合计'}, {field: 'email', title: '邮箱', minWidth: 100,align:'left'}, {field: 'realName', title: '姓名', minWidth: 120,align:'left'}, - {field: 'inviteId', title: '邀请码', minWidth: 120,align:'center'}, - {field: 'createTime', title: '时间', minWidth: 120,align:'center'}, - {field: 'sumRewardAmount', title: '持仓总盈亏', minWidth: 120,align:'center'}, + {field: 'inviteId', title: '邀请码', minWidth: 120,align:'center',sort: true}, + {field: 'createTime', title: '时间', minWidth: 120,align:'center',sort: true}, + {field: 'sumRewardAmount', title: '持仓总盈亏', minWidth: 120,align:'center',sort: true}, {field: 'pcState', title: '是否可平仓', templet: function (d) { if (d.pcState == 1) { -- Gitblit v1.9.1