From 82490db7100242b58ed9ddbd1286608a738677da Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Mon, 15 Apr 2024 18:12:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Tiobon.Core.Api/Tiobon.Core.Model.xml | 112 +++++++++--------- Tiobon.Core.Api/appsettings.json | 2 +- Tiobon.Core.Common/Seed/FrameSeed.cs | 14 +-- .../Base/Ghra/Ghra_Grade.Dto.Base.cs | 76 ++++++------ .../Edit/Ghra/Ghra_Grade.Dto.EditInput.cs | 2 +- .../Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs | 2 +- Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs | 76 ++++++------ .../View/Ghra/Ghra_Grade.Dto.View.cs | 2 +- Tiobon.Core.Services/BASE/BaseServices.cs | 96 ++++----------- 9 files changed, 163 insertions(+), 219 deletions(-) diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index e2741ac9..bc78024d 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -79,74 +79,74 @@ Ghra_Grade - + - Reverse6 + GradeNo - + - MKey + GradeName - + - Reverse9 + MKey - + - Reverse3 + DataBelongID - + - Reverse4 + Reverse1 - + - ReverseI1 + Reverse2 - + - DataBelongID + Reverse3 - + - Reverse7 + Reverse4 - + - GradeNo + Reverse5 - + - Reverse1 + Reverse6 - + - Reverse2 + Reverse7 - + - Reverse5 + Reverse8 - + - GradeName + Reverse9 - + - Reverse8 + ReverseI1 @@ -415,74 +415,74 @@ Ghra_Grade - + - Reverse6 + GradeNo - + - MKey + GradeName - + - Reverse9 + MKey - + - Reverse3 + DataBelongID - + - Reverse4 + Reverse1 - + - ReverseI1 + Reverse2 - + - DataBelongID + Reverse3 - + - Reverse7 + Reverse4 - + - GradeNo + Reverse5 - + - Reverse1 + Reverse6 - + - Reverse2 + Reverse7 - + - Reverse5 + Reverse8 - + - GradeName + Reverse9 - + - Reverse8 + ReverseI1 diff --git a/Tiobon.Core.Api/appsettings.json b/Tiobon.Core.Api/appsettings.json index 9cbc2674..58704b32 100644 --- a/Tiobon.Core.Api/appsettings.json +++ b/Tiobon.Core.Api/appsettings.json @@ -290,7 +290,7 @@ } }, "IpRateLimiting": { - "EnableEndpointRateLimiting": true, //False: globally executed, true: executed for each + "EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each "StackBlockedRequests": false, //False: Number of rejections should be recorded on another counter "RealIpHeader": "X-Real-IP", "ClientIdHeader": "X-ClientId", diff --git a/Tiobon.Core.Common/Seed/FrameSeed.cs b/Tiobon.Core.Common/Seed/FrameSeed.cs index c6fa456e..9e9983fd 100644 --- a/Tiobon.Core.Common/Seed/FrameSeed.cs +++ b/Tiobon.Core.Common/Seed/FrameSeed.cs @@ -138,7 +138,7 @@ namespace Tiobon.Core.Common.Seed /// {ClassName} /// [Route(""api/[controller]"")] - [ApiController, GlobalActionFilter] + [ApiController, GlobalActionFilter] [Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_" + groupName + @")] public class {ClassName}Controller : ControllerBase { @@ -181,7 +181,7 @@ namespace Tiobon.Core.Common.Seed if (entity == null) return MessageModel<{ClassName}Dto>.Fail(""获取失败""); else - return new MessageModel<{ClassName}Dto>() { msg = ""获取成功"", success = true, response = entity }; + return new MessageModel<{ClassName}Dto>() { msg = ""获取成功"", success = true, response = entity }; } #endregion @@ -213,7 +213,7 @@ namespace Tiobon.Core.Common.Seed /// /// [HttpPut(""{Id}"")] - public async Task> Put(long Id, [FromBody] Edit{ClassName}Input editModel) + public async Task Put(long Id, [FromBody] Edit{ClassName}Input editModel) { var data = MessageModel.Success(""更新成功""); data.success = await _{ClassName}Services.Update(Id, editModel); @@ -231,12 +231,12 @@ namespace Tiobon.Core.Common.Seed /// /// [HttpDelete(""{Id}"")] - public async Task> Delete(long Id) + public async Task Delete(long Id) { - var data = MessageModel.Success(""删除成功"") + var data = MessageModel.Success(""删除成功""); var entity = await _{ClassName}Services.QueryById(Id); if (entity == null) - return MessageModel.Fail(""删除失败""); + return MessageModel.Fail(""删除失败""); entity.IsEnable = 0; data.success = await _{ClassName}Services.Update(entity); @@ -340,7 +340,7 @@ namespace " + strNameSpace + @" ON C.major_id = B.object_id AND C.minor_id = B.column_id LEFT JOIN information_schema.columns D ON D.column_name = B.name AND D.TABLE_NAME = '{0}' - WHERE A.name = '{0}'"; + WHERE A.name = '{0}' ORDER BY B.column_id ASC"; sql = string.Format(sql, tableName); var dtColumn = sqlSugarClient.Ado.GetDataTable(sql); build.Append("/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。\r\n"); diff --git a/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs index 2bb44c74..f3ef1097 100644 --- a/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghra/Ghra_Grade.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/4/15 15:25:43 SimonHsiao 初版 +*V0.01 2024/4/15 18:01:18 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -27,10 +27,16 @@ namespace Tiobon.Core.Model.Models { /// - /// Reverse6 + /// GradeNo /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } + [Display(Name = "GradeNo"), Description("GradeNo"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] + public string GradeNo { get; set; } + + /// + /// GradeName + /// + [Display(Name = "GradeName"), Description("GradeName"), MaxLength(1000, ErrorMessage = "GradeName 不能超过 1000 个字符")] + public string GradeName { get; set; } /// /// MKey @@ -39,10 +45,21 @@ namespace Tiobon.Core.Model.Models public string MKey { get; set; } /// - /// Reverse9 + /// DataBelongID /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } + public int? DataBelongID { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } /// /// Reverse3 @@ -57,14 +74,16 @@ namespace Tiobon.Core.Model.Models public string Reverse4 { get; set; } /// - /// ReverseI1 + /// Reverse5 /// - public int? ReverseI1 { get; set; } + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } /// - /// DataBelongID + /// Reverse6 /// - public int? DataBelongID { get; set; } + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } /// /// Reverse7 @@ -73,40 +92,21 @@ namespace Tiobon.Core.Model.Models public string Reverse7 { get; set; } /// - /// GradeNo - /// - [Display(Name = "GradeNo"), Description("GradeNo"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] - public string GradeNo { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse5 + /// Reverse8 /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } /// - /// GradeName + /// Reverse9 /// - [Display(Name = "GradeName"), Description("GradeName"), MaxLength(1000, ErrorMessage = "GradeName 不能超过 1000 个字符")] - public string GradeName { get; set; } + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } /// - /// Reverse8 + /// ReverseI1 /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } + public int? ReverseI1 { get; set; } /// /// ReverseI2 diff --git a/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs index 82f38a7f..91d35816 100644 --- a/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghra/Ghra_Grade.Dto.EditInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/4/15 15:25:43 SimonHsiao 初版 +*V0.01 2024/4/15 18:01:18 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ diff --git a/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs index cf3d6bcd..6b7e1223 100644 --- a/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghra/Ghra_Grade.Dto.InsertInput.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/4/15 15:25:43 SimonHsiao 初版 +*V0.01 2024/4/15 18:01:18 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ diff --git a/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs b/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs index 49d226bf..538b5c43 100644 --- a/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs +++ b/Tiobon.Core.Model/Models/Ghra/Ghra_Grade.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/4/15 15:25:43 SimonHsiao 初版 +*V0.01 2024/4/15 18:01:18 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -29,10 +29,16 @@ namespace Tiobon.Core.Model.Models { /// - /// Reverse6 + /// GradeNo /// - [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] - public string Reverse6 { get; set; } + [Display(Name = "GradeNo"), Description("GradeNo"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] + public string GradeNo { get; set; } + + /// + /// GradeName + /// + [Display(Name = "GradeName"), Description("GradeName"), MaxLength(1000, ErrorMessage = "GradeName 不能超过 1000 个字符")] + public string GradeName { get; set; } /// /// MKey @@ -41,10 +47,21 @@ namespace Tiobon.Core.Model.Models public string MKey { get; set; } /// - /// Reverse9 + /// DataBelongID /// - [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] - public string Reverse9 { get; set; } + public int? DataBelongID { get; set; } + + /// + /// Reverse1 + /// + [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// Reverse2 + /// + [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } /// /// Reverse3 @@ -59,14 +76,16 @@ namespace Tiobon.Core.Model.Models public string Reverse4 { get; set; } /// - /// ReverseI1 + /// Reverse5 /// - public int? ReverseI1 { get; set; } + [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } /// - /// DataBelongID + /// Reverse6 /// - public int? DataBelongID { get; set; } + [Display(Name = "Reverse6"), Description("Reverse6"), MaxLength(1000, ErrorMessage = "Reverse6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } /// /// Reverse7 @@ -75,40 +94,21 @@ namespace Tiobon.Core.Model.Models public string Reverse7 { get; set; } /// - /// GradeNo - /// - [Display(Name = "GradeNo"), Description("GradeNo"), MaxLength(100, ErrorMessage = "GradeNo 不能超过 100 个字符")] - public string GradeNo { get; set; } - - /// - /// Reverse1 - /// - [Display(Name = "Reverse1"), Description("Reverse1"), MaxLength(1000, ErrorMessage = "Reverse1 不能超过 1000 个字符")] - public string Reverse1 { get; set; } - - /// - /// Reverse2 - /// - [Display(Name = "Reverse2"), Description("Reverse2"), MaxLength(1000, ErrorMessage = "Reverse2 不能超过 1000 个字符")] - public string Reverse2 { get; set; } - - /// - /// Reverse5 + /// Reverse8 /// - [Display(Name = "Reverse5"), Description("Reverse5"), MaxLength(1000, ErrorMessage = "Reverse5 不能超过 1000 个字符")] - public string Reverse5 { get; set; } + [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } /// - /// GradeName + /// Reverse9 /// - [Display(Name = "GradeName"), Description("GradeName"), MaxLength(1000, ErrorMessage = "GradeName 不能超过 1000 个字符")] - public string GradeName { get; set; } + [Display(Name = "Reverse9"), Description("Reverse9"), MaxLength(1000, ErrorMessage = "Reverse9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } /// - /// Reverse8 + /// ReverseI1 /// - [Display(Name = "Reverse8"), Description("Reverse8"), MaxLength(1000, ErrorMessage = "Reverse8 不能超过 1000 个字符")] - public string Reverse8 { get; set; } + public int? ReverseI1 { get; set; } /// /// ReverseI2 diff --git a/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs b/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs index 35ee4ab9..4ecaf46f 100644 --- a/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghra/Ghra_Grade.Dto.View.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2024/4/15 15:25:43 SimonHsiao 初版 +*V0.01 2024/4/15 18:01:18 SimonHsiao 初版 * * Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index db3f875d..51dde1b1 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -101,12 +101,7 @@ namespace Tiobon.Core.Services.BASE return await BaseDal.Update(operateAnonymousObjects); } - public async Task Update( - TEntity entity, - List lstColumns = null, - List lstIgnoreColumns = null, - string where = "" - ) + public async Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = "") { return await BaseDal.Update(entity, lstColumns, lstIgnoreColumns, where); } @@ -264,10 +259,7 @@ namespace Tiobon.Core.Services.BASE /// 前N条 /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query( - string where, - int top, - string orderByFileds) + public async Task> Query(string where, int top, string orderByFileds) { return await BaseDal.Query(where, top, orderByFileds); } @@ -280,17 +272,9 @@ namespace Tiobon.Core.Services.BASE /// 页大小 /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query( - Expression> whereExpression, - int pageIndex, - int pageSize, - string orderByFileds) + public async Task> Query(Expression> whereExpression, int pageIndex, int pageSize, string orderByFileds) { - return await BaseDal.Query( - whereExpression, - pageIndex, - pageSize, - orderByFileds); + return await BaseDal.Query(whereExpression, pageIndex, pageSize, orderByFileds); } /// @@ -301,24 +285,14 @@ namespace Tiobon.Core.Services.BASE /// 页大小 /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query( - string where, - int pageIndex, - int pageSize, - string orderByFileds) + public async Task> Query(string where, int pageIndex, int pageSize, string orderByFileds) { - return await BaseDal.Query( - where, - pageIndex, - pageSize, - orderByFileds); + return await BaseDal.Query(where, pageIndex, pageSize, orderByFileds); } - public async Task> QueryPage(Expression> whereExpression, - int pageIndex = 1, int pageSize = 20, string orderByFileds = null) + public async Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFileds = null) { - return await BaseDal.QueryPage(whereExpression, - pageIndex, pageSize, orderByFileds); + return await BaseDal.QueryPage(whereExpression, pageIndex, pageSize, orderByFileds); } public async Task> QueryFilterPage([FromFilter] QueryFilter filter) @@ -364,11 +338,9 @@ namespace Tiobon.Core.Services.BASE return await BaseDal.QueryByIdSplit(objId); } - public async Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, - int pageIndex = 1, int pageSize = 20, string orderByFields = null) + public async Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null) { - return await BaseDal.QueryPageSplit(whereExpression, beginTime, endTime, - pageIndex, pageSize, orderByFields); + return await BaseDal.QueryPageSplit(whereExpression, beginTime, endTime, pageIndex, pageSize, orderByFields); } #endregion @@ -532,12 +504,7 @@ namespace Tiobon.Core.Services.BASE return await BaseDal.Update(operateAnonymousObjects); } - public async Task Update( - TEntity entity, - List lstColumns = null, - List lstIgnoreColumns = null, - string where = "" - ) + public async Task Update(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string where = "") { return await BaseDal.Update(entity, lstColumns, lstIgnoreColumns, where); } @@ -695,10 +662,7 @@ namespace Tiobon.Core.Services.BASE /// 前N条 /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query( - string where, - int top, - string orderByFileds) + public async Task> Query(string where, int top, string orderByFileds) { return await BaseDal.Query(where, top, orderByFileds); } @@ -711,17 +675,9 @@ namespace Tiobon.Core.Services.BASE /// 页大小 /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query( - Expression> whereExpression, - int pageIndex, - int pageSize, - string orderByFileds) + public async Task> Query(Expression> whereExpression, int pageIndex, int pageSize, string orderByFileds) { - return await BaseDal.Query( - whereExpression, - pageIndex, - pageSize, - orderByFileds); + return await BaseDal.Query(whereExpression, pageIndex, pageSize, orderByFileds); } /// @@ -732,24 +688,14 @@ namespace Tiobon.Core.Services.BASE /// 页大小 /// 排序字段，如name asc,age desc /// 数据列表 - public async Task> Query( - string where, - int pageIndex, - int pageSize, - string orderByFileds) + public async Task> Query(string where, int pageIndex, int pageSize, string orderByFileds) { - return await BaseDal.Query( - where, - pageIndex, - pageSize, - orderByFileds); + return await BaseDal.Query(where, pageIndex, pageSize, orderByFileds); } - public async Task> QueryPage(Expression> whereExpression, - int pageIndex = 1, int pageSize = 20, string orderByFileds = null) + public async Task> QueryPage(Expression> whereExpression, int pageIndex = 1, int pageSize = 20, string orderByFileds = null) { - return await BaseDal.QueryPage(whereExpression, - pageIndex, pageSize, orderByFileds); + return await BaseDal.QueryPage(whereExpression, pageIndex, pageSize, orderByFileds); } public async Task> QueryFilterPage([FromFilter] QueryFilter filter) @@ -798,11 +744,9 @@ namespace Tiobon.Core.Services.BASE return await BaseDal.QueryByIdSplit(objId); } - public async Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, - int pageIndex = 1, int pageSize = 20, string orderByFields = null) + public async Task> QueryPageSplit(Expression> whereExpression, DateTime beginTime, DateTime endTime, int pageIndex = 1, int pageSize = 20, string orderByFields = null) { - return await BaseDal.QueryPageSplit(whereExpression, beginTime, endTime, - pageIndex, pageSize, orderByFields); + return await BaseDal.QueryPageSplit(whereExpression, beginTime, endTime, pageIndex, pageSize, orderByFields); } #endregion