补充国家和属性字段

models/base_from_usda_fas.go

@@ -209,6 +209,8 @@ type BaseFromUsdaFasIndex struct {
 	BaseFileName           string
 	RenameFileName         string
 	TerminalCode           string
+	Country                string `description:"国家"`
+	Commodity              string `description:"属性"`
 	CreateTime             time.Time
 	ModifyTime             time.Time
 }
@@ -258,6 +260,8 @@ type HandleUsdaFasExcelData struct {
 	Unit               string `description:"单位"`
 	Sort               int    `description:"排序号"`
 	Frequency          string `description:"频度"`
+	Country            string `description:"国家"`
+	Commodity          string `description:"属性"`
 	ExcelDataMap       map[string]string
 }
 

services/base_from_usda_fas.go

@@ -148,6 +148,8 @@ func handleUsdaFasIndex(req *models.HandleUsdaFasExcelData, terminalCode string,
 		indexObj.IndexName = indexName
 		indexObj.Frequency = req.Frequency
 		indexObj.ClassifyId = classifyId
+		indexObj.Country = req.Country
+		indexObj.Commodity = req.Commodity
 		indexObj.Unit = req.Unit
 		indexObj.Sort = req.Sort
 		indexObj.ModifyTime = time.Now()
@@ -174,6 +176,8 @@ func handleUsdaFasIndex(req *models.HandleUsdaFasExcelData, terminalCode string,
 		indexObj.IndexName = indexName
 		indexObj.Frequency = req.Frequency
 		indexObj.ClassifyId = classifyId
+		indexObj.Country = req.Country
+		indexObj.Commodity = req.Commodity
 		indexObj.Unit = req.Unit
 		indexObj.Sort = req.Sort
 		indexObj.ModifyTime = time.Now()
@@ -182,7 +186,8 @@ func handleUsdaFasIndex(req *models.HandleUsdaFasExcelData, terminalCode string,
 		updateColsArr := make([]string, 0)
 		updateColsArr = append(updateColsArr, "index_name")
 		updateColsArr = append(updateColsArr, "classify_id")
-		updateColsArr = append(updateColsArr, "unit")
+		updateColsArr = append(updateColsArr, "country")
+		updateColsArr = append(updateColsArr, "commodity")
 		updateColsArr = append(updateColsArr, "frequency")
 		updateColsArr = append(updateColsArr, "sort")
 		updateColsArr = append(updateColsArr, "modify_time")