涌益生猪排序

models/base_from_yongyi.go

@@ -240,20 +240,19 @@ func (y *BaseFromYongyiData) AddMulti(item []*BaseFromYongyiData) (err error) {
 
 // HandleYongyiExcelData 涌益咨询的excel数据
 type HandleYongyiExcelData struct {
-	//BaseFilePath   string
-	//RenameFilePath string
 	ClassifyName string `description:"指标目录"`
+	ClassifySort int    `description:"指标目录排序号"`
 	IndexName    string `description:"指标名称"`
 	IndexCode    string `description:"指标编码"`
 	Unit         string `description:"单位"`
 	Sort         int    `description:"排序号"`
 	Frequency    string `description:"频度"`
-	TerminalCode string `description:"编码"`
 	ExcelDataMap map[string]string
 }
 
 type HandleYongyiExcelDataReq struct {
-	List []*HandleYongyiExcelData
+	List         []*HandleYongyiExcelData
+	TerminalCode string `description:"编码"`
 }
 
 func (y *BaseFromYongyiData) GetMaxAndMinDateByIndexCode(indexCode string) (item *EdbInfoMaxAndMinInfo, err error) {

services/base_from_yongyi.go

@@ -25,7 +25,7 @@ func HandleYongyiIndex(req *models.HandleYongyiExcelDataReq) (err error) {
 			errMsgList = append(errMsgList, fmt.Sprintf("新增指标异常，指标编码%s或者指标ID%s为空：", v.IndexCode, v.IndexName))
 			continue
 		}
-		err = handleYongyiIndex(v)
+		err = handleYongyiIndex(v, req.TerminalCode)
 		if err != nil {
 			errMsgList = append(errMsgList, fmt.Sprintf("新增指标异常，指标编码：%s, Err: %s", v.IndexCode, err))
 			return
@@ -34,8 +34,7 @@ func HandleYongyiIndex(req *models.HandleYongyiExcelDataReq) (err error) {
 	return
 }
 
-func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
-	terminalCode := req.TerminalCode
+func handleYongyiIndex(req *models.HandleYongyiExcelData, terminalCode string) (err error) {
 	indexName := req.IndexName
 	indexCode := req.IndexCode
 	excelDataMap := req.ExcelDataMap
@@ -76,7 +75,7 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 					SysUserId:       0,
 					SysUserRealName: "",
 					Level:           1,
-					Sort:            0,
+					Sort:            req.ClassifySort,
 					ModifyTime:      now,
 					CreateTime:      now,
 				}
@@ -87,13 +86,6 @@ func handleYongyiIndex(req *models.HandleYongyiExcelData) (err error) {
 					return
 				}
 				classifyObj.ClassifyId = classifyId
-				//修改排序
-				classifyObj.Sort = int(classifyId)
-				err = classifyObj.Update([]string{"Sort"})
-				if err != nil {
-					err = fmt.Errorf("修改分类排序失败 Err：%s", err)
-					return
-				}
 			} else {
 				return
 			}