合并分支 'dev' 到 'test'

导入



查看合并请求 !16

@@ -343,7 +343,6 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm
 			ItemName:            strings.TrimSpace(v["itemName"]),
 			ItemName:            strings.TrimSpace(v["itemName"]),
 			ChoiceId:            choiceId,
 			ChoiceId:            choiceId,
 			Text:                strings.TrimSpace(v["text"]),
 			Text:                strings.TrimSpace(v["text"]),
-			Urls:                []string{ossFile},
 			Formula:             strings.TrimSpace(v["formula"]),
 			Formula:             strings.TrimSpace(v["formula"]),
 			ChargePersons:       chargePersons,
 			ChargePersons:       chargePersons,
 			Target:              strings.TrimSpace(v["target"]),
 			Target:              strings.TrimSpace(v["target"]),
@@ -355,6 +354,11 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm
 			YesterdayActual:     strings.TrimSpace(v["yesterdayActual"]),
 			YesterdayActual:     strings.TrimSpace(v["yesterdayActual"]),
 			Types:               importCostCommand.Types,
 			Types:               importCostCommand.Types,
 		}
 		}
+		if ossFile != "" {
+			item.Urls = []string{ossFile}
+		} else {
+			item.Urls = []string{}
+		}
 		createCostManagemant.CostManagemants = append(createCostManagemant.CostManagemants, item)
 		createCostManagemant.CostManagemants = append(createCostManagemant.CostManagemants, item)
 	}
 	}
 	result, err := cost_structured.NewHttpLibCostStructured(importDataCommand.Operator).BatchCreateCostManagemant(createCostManagemant)
 	result, err := cost_structured.NewHttpLibCostStructured(importDataCommand.Operator).BatchCreateCostManagemant(createCostManagemant)

@@ -17,7 +17,7 @@ type BatchCreateCostManagemant struct {
 // 成本管理
 // 成本管理
 type CostManagemant struct {
 type CostManagemant struct {
 	// 项目编码
 	// 项目编码
-	ProjectCode string `json:"projectCode,string"`
+	ProjectCode string `json:"projectCode"`
 	// 成本管理Id
 	// 成本管理Id
 	CostManagemantId int64 `json:"costManagemantId,string"`
 	CostManagemantId int64 `json:"costManagemantId,string"`
 	// 公式id
 	// 公式id