diff --git a/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavTask.cs b/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavTask.cs index 3c100eb7a..1310bf779 100644 --- a/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavTask.cs +++ b/Src/Asp.Net/SqlSugar/Abstract/ExecuteNavProvider/UpdateNavTask.cs @@ -59,6 +59,23 @@ namespace SqlSugar result.NavContext = UpdateNavProvider.NavContext; return result; } + + public UpdateNavMethodInfo IncludeByNameString(string navMemberName, UpdateNavOptions updateNavOptions=null) + { + UpdateNavMethodInfo result = new UpdateNavMethodInfo(); + result.Context = UpdateNavProvider._Context; + var entityInfo = result.Context.EntityMaintenance.GetEntityInfo(); + Type properyItemType; + bool isList; + Expression exp =UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType,out isList); + var method = this.GetType().GetMyMethod("Include", 2,isList) + .MakeGenericMethod(properyItemType); + var obj = method.Invoke(this, new object[] { exp, updateNavOptions }); + result.MethodInfos = obj; + return result; + } + + } public class UpdateNavTask where T : class, new() where Root : class, new() { diff --git a/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateNavMethodInfo.cs b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateNavMethodInfo.cs new file mode 100644 index 000000000..15f4b9e8f --- /dev/null +++ b/Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateNavMethodInfo.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using System.Reflection; +using System.Text; +using System.Threading.Tasks; + +namespace SqlSugar +{ + public class UpdateNavMethodInfo + { + internal object MethodInfos { get; set; } + internal SqlSugarProvider Context { get; set; } + + public UpdateNavMethodInfo IncludeByNameString(string navMemberName, UpdateNavOptions updateNavOptions = null) + { + var type = MethodInfos.GetType().GetGenericArguments()[0]; + var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type); + Type properyItemType; + bool isList; + Expression exp = UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType, out isList); + var method = this.MethodInfos.GetType().GetMyMethod("Include", 2, isList) + .MakeGenericMethod(properyItemType); + var obj = method.Invoke(this.MethodInfos, new object[] { exp, updateNavOptions }); + this.MethodInfos = obj; + return this; + } + public UpdateNavMethodInfo ThenIncludeByNameString(string navMemberName, UpdateNavOptions updateNavOptions = null) + { + var type = MethodInfos.GetType().GetGenericArguments()[0]; + var entityInfo = this.Context.EntityMaintenance.GetEntityInfo(type); + Type properyItemType; + bool isList; + Expression exp = UtilMethods.GetIncludeExpression(navMemberName, entityInfo, out properyItemType, out isList); + var method = this.MethodInfos.GetType().GetMyMethod("ThenInclude", 2, isList) + .MakeGenericMethod(properyItemType); + var obj = method.Invoke(this.MethodInfos, new object[] { exp, updateNavOptions }); + this.MethodInfos = obj; + return this; + } + public async Task ExecuteCommandAsync() + { + if (Context == null) return false; + var result = MethodInfos.GetType().GetMethod("ExecuteCommandAsync").Invoke(MethodInfos, new object[] { }); + return await (Task)result; + } + public bool ExecuteCommand() + { + if (Context == null) return false; + var result = MethodInfos.GetType().GetMethod("ExecuteCommand").Invoke(MethodInfos, new object[] { }); + return (bool)result; + } + } +} diff --git a/Src/Asp.Net/SqlSugar/SqlSugar.csproj b/Src/Asp.Net/SqlSugar/SqlSugar.csproj index 18dab3d2e..0885c5645 100644 --- a/Src/Asp.Net/SqlSugar/SqlSugar.csproj +++ b/Src/Asp.Net/SqlSugar/SqlSugar.csproj @@ -158,6 +158,7 @@ + diff --git a/Src/Asp.Net/SqlSugar/Utilities/CommonExtensions.cs b/Src/Asp.Net/SqlSugar/Utilities/CommonExtensions.cs index ee7606cd8..3a855fb28 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/CommonExtensions.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/CommonExtensions.cs @@ -32,6 +32,14 @@ namespace SqlSugar it.GetParameters().Length == argCount&& it.GetParameters().First().ParameterType==parameterType); } + public static MethodInfo GetMyMethod(this Type type, string name, int argCount, bool isList) + { + var methods= type.GetMethods().Where(it => it.Name == name).Where(it => + it.GetParameters().Length == argCount&& + it.GetParameters()[0].ToString().Contains("List`") == isList).ToList(); + return methods.First(); + } + public static MethodInfo GetMyMethod(this Type type, string name, int argCount, Type parameterType,Type parameterType2) { return type.GetMethods().Where(it=>it.Name == name).FirstOrDefault(it => diff --git a/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs index 6c8fcb5b1..bf37a70eb 100644 --- a/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs +++ b/Src/Asp.Net/SqlSugar/Utilities/UtilMethods.cs @@ -18,7 +18,22 @@ namespace SqlSugar { public class UtilMethods { - + internal static Expression GetIncludeExpression(string navMemberName, EntityInfo entityInfo, out Type properyItemType,out bool isList) + { + var navInfo = entityInfo.Columns.Where(it => it.Navigat != null && it.PropertyName.EqualCase(navMemberName)).FirstOrDefault(); + var properyType = navInfo.PropertyInfo.PropertyType; + properyItemType = properyType; + if (properyType.FullName.IsCollectionsList()) + { + properyItemType = properyType.GetGenericArguments()[0]; + isList = true; + } + else + { + isList = false; + } + return ExpressionBuilderHelper.CreateExpressionSelectField(entityInfo.Type, navInfo.PropertyName, properyType); + } public static string RemoveEqualOne(string value) { value = value.TrimEnd(' ').TrimEnd('1').TrimEnd('=');