瀏覽代碼

fix:添加指标的时候,默认放在该目录的最下方

Roc 8 月之前
父節點
當前提交
d2f82cc30b
共有 3 個文件被更改,包括 29 次插入1 次删除
  1. 1 1
      models/base_from_calculate.go
  2. 1 0
      models/edb_data_calculate_tbz.go
  3. 27 0
      models/edb_info.go

+ 1 - 1
models/base_from_calculate.go

@@ -81,7 +81,7 @@ func AddCalculateInfo(req EdbInfoCalculateSaveReq, calculateMappingList []*EdbIn
 		MaxValue:         0,
 		CalculateFormula: req.CalculateFormula,
 		EdbType:          2,
-		Sort:             0,
+		Sort:             GetEdbMaxSortByClassifyId(req.ClassifyId),
 		MoveType:         0,
 		MoveFrequency:    "",
 		NoUpdate:         0,

+ 1 - 0
models/edb_data_calculate_tbz.go

@@ -45,6 +45,7 @@ func AddCalculateTbz(req *EdbInfoCalculateBatchSaveReq, fromEdbInfo *EdbInfo, ed
 		edbInfo.EdbNameEn = req.EdbName
 		edbInfo.UnitEn = req.Unit
 		edbInfo.EdbType = 2
+		edbInfo.Sort = GetEdbMaxSortByClassifyId(req.ClassifyId)
 		newEdbInfoId, tmpErr := to.Insert(edbInfo)
 		if tmpErr != nil {
 			err = tmpErr

+ 27 - 0
models/edb_info.go

@@ -1499,3 +1499,30 @@ func GetEdbInfoByEdbCodeList(source int, edbCodeList []string) (items []*EdbInfo
 
 	return
 }
+
+// getEdbMaxSortByClassifyId
+// @Description: 获取该分类下最大的排序
+// @author: Roc
+// @datetime 2024-07-05 09:39:46
+// @param classifyId int
+// @return sort int
+// @return err error
+func getEdbMaxSortByClassifyId(classifyId int) (sort int, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id = ? `
+	err = o.Raw(sql, classifyId).QueryRow(&sort)
+
+	return
+}
+
+// GetEdbMaxSortByClassifyId
+// @Description: 获取该分类下最大的排序(忽略错误信息)
+// @author: Roc
+// @datetime 2024-07-05 09:39:46
+// @param classifyId int
+// @return sort int
+func GetEdbMaxSortByClassifyId(classifyId int) (sort int) {
+	sort, _ = getEdbMaxSortByClassifyId(classifyId)
+
+	return
+}