xyxie 1 år sedan
förälder
incheckning
85353c8fad
2 ändrade filer med 2 tillägg och 6 borttagningar
  1. 1 0
      models/base_from_yongyi.go
  2. 1 6
      services/base_from_yongyi.go

+ 1 - 0
models/base_from_yongyi.go

@@ -232,6 +232,7 @@ type HandleYongyiExcelData struct {
 	IndexName    string `description:"指标名称"`
 	IndexCode    string `description:"指标编码"`
 	Unit         string `description:"单位"`
+	Sort         int    `description:"排序号"`
 	Frequency    string `description:"频度"`
 	TerminalCode string `description:"编码"`
 	ExcelDataMap map[string]string

+ 1 - 6
services/base_from_yongyi.go

@@ -116,6 +116,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 		indexObj.Frequency = req.Frequency
 		indexObj.ClassifyId = classifyId
 		indexObj.Unit = req.Unit
+		indexObj.Sort = req.Sort
 		indexObj.ModifyTime = time.Now()
 		indexObj.CreateTime = time.Now()
 		indexObj.TerminalCode = terminalCode
@@ -125,12 +126,6 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 			return
 		}
 		indexObj.YongyiIndexId = indexId
-		//修改排序
-		indexObj.Sort = int(indexId)
-		err = indexObj.Update([]string{"Sort"})
-		if err != nil {
-			return
-		}
 	} else if isAdd == 2 {
 		if item.TerminalCode == `` && terminalCode != `` {
 			item.TerminalCode = terminalCode