fix: 指标收藏排序

controllers/data_manage/edb_collect.go

@@ -9,6 +9,7 @@ import (
 	"eta_gn/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"sort"
 	"strings"
 	"time"
 )
@@ -141,6 +142,9 @@ func (this *EdbCollectController) List() {
 	for _, v := range list {
 		resp.List = append(resp.List, data_manage.FormatEdbInfo2CollectItem(v))
 	}
+	sort.Slice(resp.List, func(i, j int) bool {
+		return resp.List[i].Sort < resp.List[j].Sort
+	})
 
 	page = paging.GetPaging(currentIndex, pageSize, int(dataCount))
 	resp.Paging = page

models/data_manage/edb_collect.go

@@ -225,7 +225,8 @@ MAX(b."classify_id") "classify_id",
 MAX(b."create_time") "create_time",
 MAX(b."unique_code") "unique_code",
 MAX(b."chart_image") "chart_image",
-MAX(b."modify_time") "modify_time"
+MAX(b."modify_time") "modify_time",
+MAX(a."sort") AS "sort"
  FROM edb_collect AS a JOIN edb_info AS b ON a.edb_info_id = b.edb_info_id
 	  WHERE 1=1 %s
 	  GROUP BY b.edb_info_id
@@ -258,6 +259,7 @@ type CollectEdbInfoItem struct {
 	CollectClassifyIdList []int  `description:"收藏分类ID列表"`
 	CollectTime           string `description:"收藏时间"`
 	CreateTime            string `description:"创建时间"`
+	Sort                  int    `description:"排序"`
 }
 
 func FormatEdbInfo2CollectItem(origin *CollectEdbInfoQuery) (item *CollectEdbInfoItem) {
@@ -287,6 +289,7 @@ func FormatEdbInfo2CollectItem(origin *CollectEdbInfoQuery) (item *CollectEdbInf
 	item.CollectClassifyIdList = collectClassifyIdList
 	item.CollectTime = origin.CollectTime.Format(utils.FormatDateTime)
 	item.CreateTime = origin.CreateTime.Format(utils.FormatDateTime)
+	item.Sort = origin.Sort
 	return
 }