From a4a5e894850c6681733d632838f3563f0a57f8db Mon Sep 17 00:00:00 2001 From: sunkaixuna <610262374@qq.com> Date: Sat, 31 Jul 2021 21:28:43 +0800 Subject: [PATCH] Rename --- Src/Asp.Net/DmTest/Demo/Demo0_SqlSugarClient.cs | 4 ++-- .../MySqlTest/Demo/Demo0_SqlSugarClient.cs | 4 ++-- .../OracleTest/Demo/Demo0_SqlSugarClient.cs | 4 ++-- .../PgSqlTest/Demo/Demo0_SqlSugarClient.cs | 4 ++-- .../SqlServerTest/Demo/Demo0_SqlSugarClient.cs | 4 ++-- Src/Asp.Net/SqlSugar/Entities/PageModel.cs | 2 +- Src/Asp.Net/SqlSugar/SimpleClient.cs | 16 ++++++++-------- .../SqliteTest/Demo/Demo0_SqlSugarClient.cs | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Src/Asp.Net/DmTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/DmTest/Demo/Demo0_SqlSugarClient.cs index 8ed1c8415..b65441a18 100644 --- a/Src/Asp.Net/DmTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.Net/DmTest/Demo/Demo0_SqlSugarClient.cs @@ -103,9 +103,9 @@ namespace OrmTest var data4 = orderDb.GetSingle(it => it.Id == 1); var p = new PageModel() { PageIndex = 1, PageSize = 2 }; var data5 = orderDb.GetPageList(it => it.Name == "xx", p); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); var data6 = orderDb.GetPageList(it => it.Name == "xx", p, it => it.Name, OrderByType.Asc); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); List conModels = new List(); conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1", FieldValueConvertFunc=it=>Convert.ToInt32(it) });//id=1 var data7 = orderDb.GetPageList(conModels, p, it => it.Name, OrderByType.Asc); diff --git a/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs index 568bb37d6..841d5a137 100644 --- a/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.Net/MySqlTest/Demo/Demo0_SqlSugarClient.cs @@ -103,9 +103,9 @@ namespace OrmTest var data4 = orderDb.GetSingle(it => it.Id == 1); var p = new PageModel() { PageIndex = 1, PageSize = 2 }; var data5 = orderDb.GetPageList(it => it.Name == "xx", p); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); var data6 = orderDb.GetPageList(it => it.Name == "xx", p, it => it.Name, OrderByType.Asc); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); List conModels = new List(); conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1 var data7 = orderDb.GetPageList(conModels, p, it => it.Name, OrderByType.Asc); diff --git a/Src/Asp.Net/OracleTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/OracleTest/Demo/Demo0_SqlSugarClient.cs index c8ff54bc5..807b6524a 100644 --- a/Src/Asp.Net/OracleTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.Net/OracleTest/Demo/Demo0_SqlSugarClient.cs @@ -110,9 +110,9 @@ namespace OrmTest var data4 = orderDb.GetSingle(it => it.Id == 1); var p = new PageModel() { PageIndex = 1, PageSize = 2 }; var data5 = orderDb.GetPageList(it => it.Name == "xx", p); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); var data6 = orderDb.GetPageList(it => it.Name == "xx", p, it => it.Name, OrderByType.Asc); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); List conModels = new List(); conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1 var data7 = orderDb.GetPageList(conModels, p, it => it.Name, OrderByType.Asc); diff --git a/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs index ed581f597..3e2848508 100644 --- a/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.Net/PgSqlTest/Demo/Demo0_SqlSugarClient.cs @@ -103,9 +103,9 @@ namespace OrmTest var data4 = orderDb.GetSingle(it => it.Id == 1); var p = new PageModel() { PageIndex = 1, PageSize = 2 }; var data5 = orderDb.GetPageList(it => it.Name == "xx", p); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); var data6 = orderDb.GetPageList(it => it.Name == "xx", p, it => it.Name, OrderByType.Asc); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); List conModels = new List(); conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1", FieldValueConvertFunc=it=>Convert.ToInt32(it) });//id=1 var data7 = orderDb.GetPageList(conModels, p, it => it.Name, OrderByType.Asc); diff --git a/Src/Asp.Net/SqlServerTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/SqlServerTest/Demo/Demo0_SqlSugarClient.cs index da891e5e5..ec02d513a 100644 --- a/Src/Asp.Net/SqlServerTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.Net/SqlServerTest/Demo/Demo0_SqlSugarClient.cs @@ -103,9 +103,9 @@ namespace OrmTest var data4 = orderDb.GetSingle(it => it.Id == 1); var p = new PageModel() { PageIndex = 1, PageSize = 2 }; var data5 = orderDb.GetPageList(it => it.Name == "xx", p); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); var data6 = orderDb.GetPageList(it => it.Name == "xx", p, it => it.Name, OrderByType.Asc); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); List conModels = new List(); conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1 var data7 = orderDb.GetPageList(conModels, p, it => it.Name, OrderByType.Asc); diff --git a/Src/Asp.Net/SqlSugar/Entities/PageModel.cs b/Src/Asp.Net/SqlSugar/Entities/PageModel.cs index 4d510dcb5..57549892a 100644 --- a/Src/Asp.Net/SqlSugar/Entities/PageModel.cs +++ b/Src/Asp.Net/SqlSugar/Entities/PageModel.cs @@ -13,6 +13,6 @@ namespace SqlSugar /// /// output /// - public int PageCount { get; set; } + public int TotalCount { get; set; } } } diff --git a/Src/Asp.Net/SqlSugar/SimpleClient.cs b/Src/Asp.Net/SqlSugar/SimpleClient.cs index 358e3b3a3..417d77045 100644 --- a/Src/Asp.Net/SqlSugar/SimpleClient.cs +++ b/Src/Asp.Net/SqlSugar/SimpleClient.cs @@ -102,28 +102,28 @@ namespace SqlSugar { int count = 0; var result = Context.Queryable().Where(whereExpression).ToPageList(page.PageIndex, page.PageSize, ref count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual List GetPageList(Expression> whereExpression, PageModel page, Expression> orderByExpression = null, OrderByType orderByType = OrderByType.Asc) { int count = 0; var result = Context.Queryable().OrderByIF(orderByExpression != null, orderByExpression, orderByType).Where(whereExpression).ToPageList(page.PageIndex, page.PageSize, ref count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual List GetPageList(List conditionalList, PageModel page) { int count = 0; var result = Context.Queryable().Where(conditionalList).ToPageList(page.PageIndex, page.PageSize, ref count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual List GetPageList(List conditionalList, PageModel page, Expression> orderByExpression = null, OrderByType orderByType = OrderByType.Asc) { int count = 0; var result = Context.Queryable().OrderByIF(orderByExpression != null, orderByExpression, orderByType).Where(conditionalList).ToPageList(page.PageIndex, page.PageSize, ref count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual bool IsAny(Expression> whereExpression) @@ -212,28 +212,28 @@ namespace SqlSugar { RefAsync count = 0; var result =await Context.Queryable().Where(whereExpression).ToPageListAsync(page.PageIndex, page.PageSize, count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual async Task> GetPageListAsync(Expression> whereExpression, PageModel page, Expression> orderByExpression = null, OrderByType orderByType = OrderByType.Asc) { RefAsync count = 0; var result =await Context.Queryable().OrderByIF(orderByExpression != null, orderByExpression, orderByType).Where(whereExpression).ToPageListAsync(page.PageIndex, page.PageSize, count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual async Task> GetPageListAsync(List conditionalList, PageModel page) { RefAsync count = 0; var result =await Context.Queryable().Where(conditionalList).ToPageListAsync(page.PageIndex, page.PageSize, count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual async Task> GetPageListAsync(List conditionalList, PageModel page, Expression> orderByExpression = null, OrderByType orderByType = OrderByType.Asc) { RefAsync count = 0; var result =await Context.Queryable().OrderByIF(orderByExpression != null, orderByExpression, orderByType).Where(conditionalList).ToPageListAsync(page.PageIndex, page.PageSize, count); - page.PageCount = count; + page.TotalCount = count; return result; } public virtual Task IsAnyAsync(Expression> whereExpression) diff --git a/Src/Asp.Net/SqliteTest/Demo/Demo0_SqlSugarClient.cs b/Src/Asp.Net/SqliteTest/Demo/Demo0_SqlSugarClient.cs index ac45ea99f..03e9141b4 100644 --- a/Src/Asp.Net/SqliteTest/Demo/Demo0_SqlSugarClient.cs +++ b/Src/Asp.Net/SqliteTest/Demo/Demo0_SqlSugarClient.cs @@ -103,9 +103,9 @@ namespace OrmTest var data4 = orderDb.GetSingle(it => it.Id == 1); var p = new PageModel() { PageIndex = 1, PageSize = 2 }; var data5 = orderDb.GetPageList(it => it.Name == "xx", p); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); var data6 = orderDb.GetPageList(it => it.Name == "xx", p, it => it.Name, OrderByType.Asc); - Console.Write(p.PageCount); + Console.Write(p.TotalCount); List conModels = new List(); conModels.Add(new ConditionalModel() { FieldName = "id", ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1 var data7 = orderDb.GetPageList(conModels, p, it => it.Name, OrderByType.Asc);