Merge pull request #1047 from kingstien/SqlSugar5

支持double和float转枚举
This commit is contained in:
果糖网 2022-07-19 18:09:18 +08:00 committed by GitHub
commit db2dc3205c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions

View File

@ -302,11 +302,12 @@ namespace SqlSugar
object value = dr.GetValue(i); object value = dr.GetValue(i);
if (value != null) if (value != null)
{ {
if (value.GetType() == UtilConstants.DecType) var valueType = value.GetType();
if (valueType.IsIn(UtilConstants.FloatType, UtilConstants.DecType, UtilConstants.DobType))
{ {
value = Convert.ToUInt32(value); value = Convert.ToUInt32(value);
} }
else if (value.GetType() == UtilConstants.StringType) else if (valueType == UtilConstants.StringType)
{ {
return (T)Enum.Parse(typeof(T), value.ObjToString()); return (T)Enum.Parse(typeof(T), value.ObjToString());
} }
@ -320,11 +321,12 @@ namespace SqlSugar
object value = dr.GetValue(i); object value = dr.GetValue(i);
if (value != null) if (value != null)
{ {
if (value.GetType() == UtilConstants.DecType) var valueType = value.GetType();
if (valueType.IsIn(UtilConstants.FloatType, UtilConstants.DecType, UtilConstants.DobType))
{ {
value = Convert.ToUInt32(value); value = Convert.ToUInt32(value);
} }
else if (value.GetType() == UtilConstants.StringType) else if (valueType == UtilConstants.StringType)
{ {
return (T)Enum.Parse(typeof(T), value.ObjToString()); return (T)Enum.Parse(typeof(T), value.ObjToString());
} }

View File

@ -302,11 +302,12 @@ namespace SqlSugar
object value = dr.GetValue(i); object value = dr.GetValue(i);
if (value != null) if (value != null)
{ {
if (value.GetType() == UtilConstants.DecType) var valueType = value.GetType();
if (valueType.IsIn(UtilConstants.FloatType, UtilConstants.DecType, UtilConstants.DobType))
{ {
value = Convert.ToUInt32(value); value = Convert.ToUInt32(value);
} }
else if (value.GetType() == UtilConstants.StringType) else if (valueType == UtilConstants.StringType)
{ {
return (T)Enum.Parse(typeof(T), value.ObjToString()); return (T)Enum.Parse(typeof(T), value.ObjToString());
} }
@ -320,11 +321,12 @@ namespace SqlSugar
object value = dr.GetValue(i); object value = dr.GetValue(i);
if (value != null) if (value != null)
{ {
if (value.GetType() == UtilConstants.DecType) var valueType = value.GetType();
if (valueType.IsIn(UtilConstants.FloatType, UtilConstants.DecType, UtilConstants.DobType))
{ {
value = Convert.ToUInt32(value); value = Convert.ToUInt32(value);
} }
else if (value.GetType() == UtilConstants.StringType) else if (valueType == UtilConstants.StringType)
{ {
return (T)Enum.Parse(typeof(T), value.ObjToString()); return (T)Enum.Parse(typeof(T), value.ObjToString());
} }