This commit is contained in:
sunkaixuan
2017-09-29 17:06:13 +08:00
parent c242710855
commit 0f5b4945ca
2 changed files with 11 additions and 3 deletions

View File

@@ -224,7 +224,7 @@ namespace SqlSugar
string PropertyText = this.PropertyTemplate; string PropertyText = this.PropertyTemplate;
string PropertyDescriptionText = this.PropertyDescriptionTemplate; string PropertyDescriptionText = this.PropertyDescriptionTemplate;
string propertyName = GetPropertyName(item); string propertyName = GetPropertyName(item);
string propertyTypeName =item.DataType; string propertyTypeName =item.PropertyName;
PropertyText = GetPropertyText(item, PropertyText); PropertyText = GetPropertyText(item, PropertyText);
PropertyDescriptionText = GetPropertyDescriptionText(item, PropertyDescriptionText); PropertyDescriptionText = GetPropertyDescriptionText(item, PropertyDescriptionText);
PropertyText = PropertyDescriptionText + PropertyText; PropertyText = PropertyDescriptionText + PropertyText;
@@ -336,11 +336,18 @@ namespace SqlSugar
} }
private string GetPropertyTypeName(DbColumnInfo item) private string GetPropertyTypeName(DbColumnInfo item)
{ {
string result = this.Context.Ado.DbBind.GetPropertyTypeName(item.DataType); string result =item.PropertyType!=null?item.PropertyType.Name:this.Context.Ado.DbBind.GetPropertyTypeName(item.DataType);
if (result != "string" && result != "byte[]" && result != "object" && item.IsNullable) if (result != "string" && result != "byte[]" && result != "object" && item.IsNullable)
{ {
result += "?"; result += "?";
} }
if (result == "Int32") {
result = "int";
}
if (result == "String")
{
result = "string";
}
return result; return result;
} }
private string GetPropertyTypeConvert(DbColumnInfo item) private string GetPropertyTypeConvert(DbColumnInfo item)

View File

@@ -614,7 +614,8 @@ namespace SqlSugar
columns.Add(new DbColumnInfo() columns.Add(new DbColumnInfo()
{ {
DbColumnName=item.Name, DbColumnName=item.Name,
DataType=UtilMethods.GetUnderType(item.PropertyType).Name PropertyName= UtilMethods.GetUnderType(item.PropertyType).Name,
PropertyType=UtilMethods.GetUnderType(item.PropertyType)
}); });
} }
var result = ((this.Context.DbFirst) as DbFirstProvider).GetClassString(columns, ref className); var result = ((this.Context.DbFirst) as DbFirstProvider).GetClassString(columns, ref className);