作者 庄敏学

fixed

@@ -339,6 +339,7 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm @@ -339,6 +339,7 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm
339 targetPeriod := domain.GetTargetPeriod(v["targetPeriod"]) 339 targetPeriod := domain.GetTargetPeriod(v["targetPeriod"])
340 item := &domain.CostManagemant{ 340 item := &domain.CostManagemant{
341 ProjectCode: strings.TrimSpace(v["projectCode"]), 341 ProjectCode: strings.TrimSpace(v["projectCode"]),
  342 + ProjectName: importDataCommand.FileName,
342 ItemName: strings.TrimSpace(v["itemName"]), 343 ItemName: strings.TrimSpace(v["itemName"]),
343 ChoiceId: choiceId, 344 ChoiceId: choiceId,
344 Text: strings.TrimSpace(v["text"]), 345 Text: strings.TrimSpace(v["text"]),
@@ -364,9 +365,9 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm @@ -364,9 +365,9 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm
364 if err != nil { 365 if err != nil {
365 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 366 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
366 } 367 }
367 - if result.Code != 0{  
368 - return nil,application.ThrowError(application.BUSINESS_ERROR,result.Msg)  
369 - }else { 368 + if result.Code != 0 {
  369 + return nil, application.ThrowError(application.BUSINESS_ERROR, result.Msg)
  370 + } else {
370 return result.Data, nil 371 return result.Data, nil
371 } 372 }
372 } 373 }
@@ -77,9 +77,9 @@ var NodeTypeGroup = []NodeType{ @@ -77,9 +77,9 @@ var NodeTypeGroup = []NodeType{
77 {TypeId: 2, TypeName: "员工类型"}, 77 {TypeId: 2, TypeName: "员工类型"},
78 {TypeId: 3, TypeName: "文本类型"}, 78 {TypeId: 3, TypeName: "文本类型"},
79 {TypeId: 4, TypeName: "BOM表类型"}, 79 {TypeId: 4, TypeName: "BOM表类型"},
80 - {TypeId: 5, TypeName: "数值框"},  
81 - {TypeId: 6, TypeName: "计算框"},  
82 - {TypeId: 7, TypeName: "图片框"}, 80 + {TypeId: 5, TypeName: "数值类型"},
  81 + {TypeId: 6, TypeName: "计算类型"},
  82 + {TypeId: 7, TypeName: "图片类型"},
83 } 83 }
84 84
85 func (NodeType) GetIdByName(name string) int { 85 func (NodeType) GetIdByName(name string) int {