合并分支 'dev' 到 'test'

fixed



查看合并请求 !23

@@ -339,6 +339,7 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm
 		targetPeriod := domain.GetTargetPeriod(v["targetPeriod"])
 		targetPeriod := domain.GetTargetPeriod(v["targetPeriod"])
 		item := &domain.CostManagemant{
 		item := &domain.CostManagemant{
 			ProjectCode:         strings.TrimSpace(v["projectCode"]),
 			ProjectCode:         strings.TrimSpace(v["projectCode"]),
+			ProjectName:         importDataCommand.FileName,
 			ItemName:            strings.TrimSpace(v["itemName"]),
 			ItemName:            strings.TrimSpace(v["itemName"]),
 			ChoiceId:            choiceId,
 			ChoiceId:            choiceId,
 			Text:                strings.TrimSpace(v["text"]),
 			Text:                strings.TrimSpace(v["text"]),
@@ -364,9 +365,9 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 	}
 	}
-	if result.Code != 0{
-		return nil,application.ThrowError(application.BUSINESS_ERROR,result.Msg)
-	}else {
+	if result.Code != 0 {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, result.Msg)
+	} else {
 		return result.Data, nil
 		return result.Data, nil
 	}
 	}
 }
 }

@@ -77,9 +77,9 @@ var NodeTypeGroup = []NodeType{
 	{TypeId: 2, TypeName: "员工类型"},
 	{TypeId: 2, TypeName: "员工类型"},
 	{TypeId: 3, TypeName: "文本类型"},
 	{TypeId: 3, TypeName: "文本类型"},
 	{TypeId: 4, TypeName: "BOM表类型"},
 	{TypeId: 4, TypeName: "BOM表类型"},
-	{TypeId: 5, TypeName: "数值框"},
-	{TypeId: 6, TypeName: "计算框"},
-	{TypeId: 7, TypeName: "图片框"},
+	{TypeId: 5, TypeName: "数值类型"},
+	{TypeId: 6, TypeName: "计算类型"},
+	{TypeId: 7, TypeName: "图片类型"},
 }
 }
 
 
 func (NodeType) GetIdByName(name string) int {
 func (NodeType) GetIdByName(name string) int {