合并分支 'dev' 到 'test'

fixed



查看合并请求 !25

@@ -394,7 +394,20 @@ func (srv ExcelDataService) ImportCost(importDataCommand *command.ImportDataComm
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 	}
 	}
 	if result.Code != 0 {
 	if result.Code != 0 {
-		return nil, application.ThrowError(application.BUSINESS_ERROR, result.Msg)
+		return map[string]interface{}{
+			"successCount": 0,
+			"fail": map[string]interface{}{
+				"header": map[string]string{
+					"failReason":   "错误详情",
+					"projectCode":  "项目编码",
+					"itemName":   	"细项名称",
+				},
+				"body":   []map[string]interface{}{
+					{"failReason":result.Msg,"projectCode":"","itemName":""},
+				},
+			},
+			"successData":nil,
+		}, nil
 	} else {
 	} else {
 		return result.Data, nil
 		return result.Data, nil
 	}
 	}