diff --git a/24Hour/24Hour.csproj b/24Hour/24Hour.csproj
index b5c1b97..cadecde 100644
--- a/24Hour/24Hour.csproj
+++ b/24Hour/24Hour.csproj
@@ -9,7 +9,7 @@
- E:\Code\24Hour.Service\24Hour\bin\Debug\net6.0\24Hour.xml
+
diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs
index 9ba3cb5..b621845 100644
--- a/24Hour/Controllers/Common/CommonController.cs
+++ b/24Hour/Controllers/Common/CommonController.cs
@@ -5,6 +5,7 @@ using Elight.Utility.Code;
using Elight.Utility.Extensions;
using Elight.Utility.logs;
using java.util;
+using javax.xml.crypto;
using jdk.nashorn.@internal.ir;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
@@ -52,6 +53,7 @@ namespace _24Hour.Controllers.Common
{
try
{
+ RefAsync totalNumber = 0;//总数据
var list = new List();
//获取工作台信息
var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync();
@@ -129,9 +131,13 @@ namespace _24Hour.Controllers.Common
handleuser = q.meetwitname
});
});
- list = list.Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList();
+
+ list = list.WhereIF(Commondata.username.NotNull(), x => $"{x.username}".Contains(Commondata.username))
+ .WhereIF(Commondata.handleuser.NotNull(), x => $"{x.handleuser}".Contains(Commondata.handleuser)).ToList();
+ Commondata.RowsCount = list.Count();
+ list =list.Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList();
result.IsSucceed = true;
- result.result = list.ToList().OrderByDescending(q => q.creationtime).ToList();
+ result.result =new { Paging= Commondata, Data= list.ToList().OrderByDescending(q => q.creationtime).ToList() } ;
}
catch (System.Exception ex)
diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs
index 36f5259..59beb49 100644
--- a/24Hour/Controllers/Common/LawyerservicesController.cs
+++ b/24Hour/Controllers/Common/LawyerservicesController.cs
@@ -67,6 +67,7 @@ namespace _24Hour.Controllers.Common
[Route("QueryLawyer")]
public async Task QueryLawyer(App_LawyerServicesInput Lawyerdata)
{
+ RefAsync totalNumber = 0;//总数据
//查询律师服务
var list = await _db.Queryable()
.WhereIF(Lawyerdata.name != null, q => q.name.Contains(Lawyerdata.name))
@@ -74,7 +75,8 @@ namespace _24Hour.Controllers.Common
.WhereIF(Lawyerdata.unitId != null, q => q.unitId.Contains(Lawyerdata.unitId))
.WhereIF(Lawyerdata.state != null, q => q.state == Lawyerdata.state)
.WhereIF(Lawyerdata.StartTime != null && Lawyerdata.EndTime != null, q => q.receptiontime >= Lawyerdata.StartTime && q.receptiontime < Lawyerdata.EndTime.Value.AddDays(1))
- .Where(q => q.IsDeleted == 0&&q.unitId==_userdata.unitCode).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize);
+ .Where(q => q.IsDeleted == 0&&q.unitId==_userdata.unitCode).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber);
+ Lawyerdata.RowsCount = totalNumber;
var data = new QueryResult(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList());
result.IsSucceed = true;
result.result = data;
diff --git a/24Hour/Controllers/Common/RemoteController.cs b/24Hour/Controllers/Common/RemoteController.cs
index 8c1a9b2..38dd96a 100644
--- a/24Hour/Controllers/Common/RemoteController.cs
+++ b/24Hour/Controllers/Common/RemoteController.cs
@@ -71,6 +71,7 @@ namespace _24Hour.Controllers.Common
[Route("QueryRemote")]
public async Task QueryRemote(App_RemoteInput Remotedata)
{
+ RefAsync totalNumber = 0;//总数据
var Receptionlist = new List();
//查询远程会见记录
var list = await _db.Queryable()
@@ -78,7 +79,8 @@ namespace _24Hour.Controllers.Common
.WhereIF(Remotedata.name != null, q => q.name.Contains(Remotedata.name))
.WhereIF(Remotedata.meetwitname != null, q => q.meetwitname.Contains(Remotedata.meetwitname))
.WhereIF(Remotedata.state != null, q => q.state == Remotedata.state)
- .Where(q => q.IsDeleted == 0&&q.unitId==_userdata.unitCode).ToPageListAsync(Remotedata.PageIndex, Remotedata.PageSize);
+ .Where(q => q.IsDeleted == 0&&q.unitId==_userdata.unitCode).ToPageListAsync(Remotedata.PageIndex, Remotedata.PageSize, totalNumber);
+ Remotedata.RowsCount = totalNumber;
var data = new QueryResult(Remotedata, list.OrderByDescending(q => q.creationtime).ToList());
result.IsSucceed = true;
result.result = data;
diff --git a/24Hour/Controllers/Common/ReservationController.cs b/24Hour/Controllers/Common/ReservationController.cs
index c19496d..1647f46 100644
--- a/24Hour/Controllers/Common/ReservationController.cs
+++ b/24Hour/Controllers/Common/ReservationController.cs
@@ -78,6 +78,7 @@ namespace _24Hour.Controllers.Common
[Route("QueryReception")]
public async Task QueryReception(App_ReceptionInput Reception)
{
+ RefAsync totalNumber = 0;//总数据
var Receptionlist = new List();
//获取工作台信息
var app_staging = await _db.Queryable().Where(w => w.IsDelete == 0).ToListAsync();
@@ -85,8 +86,10 @@ namespace _24Hour.Controllers.Common
var list = await _db.Queryable()
.WhereIF(!string.IsNullOrEmpty(Reception.matter), q => q.matter.Contains(Reception.matter))
.WhereIF(!string.IsNullOrEmpty(Reception.meetwitname), q => q.meetwitname.Contains(Reception.meetwitname))
+ .WhereIF(!string.IsNullOrEmpty(Reception.phone), q => q.phone.Contains(Reception.phone))
.WhereIF(Reception.state != null, q => q.state == Reception.state)
- .Where(q => q.IsDeleted == 0&&q.unitId==_userdata.unitCode).ToPageListAsync(Reception.PageIndex, Reception.PageSize);
+ .Where(q => q.IsDeleted == 0&&q.unitId==_userdata.unitCode).ToPageListAsync(Reception.PageIndex, Reception.PageSize, totalNumber);
+ Reception.RowsCount = totalNumber;
list.ForEach(q =>
{
var data = app_staging.Where(a => a.Id == q.reservationId).FirstOrDefault();
diff --git a/24Hour/Controllers/Common/StagingController.cs b/24Hour/Controllers/Common/StagingController.cs
index ee642da..b5599e3 100644
--- a/24Hour/Controllers/Common/StagingController.cs
+++ b/24Hour/Controllers/Common/StagingController.cs
@@ -46,10 +46,12 @@ namespace _24Hour.Controllers.Common
[Route("QueryStaging")]
public async Task QueryStaging(StagingInput Staging)
{
+ RefAsync totalNumber = 0;//总数据
var list = await _db.Queryable()
.WhereIF(!string.IsNullOrEmpty(Staging.title), q => q.title.Contains(Staging.title))
.WhereIF(!string.IsNullOrEmpty(Staging.titletype), q => q.titletype.Contains(Staging.titletype))
- .Where(q => q.IsDelete == 0).ToPageListAsync(Staging.PageIndex, Staging.PageSize);
+ .Where(q => q.IsDelete == 0).ToPageListAsync(Staging.PageIndex, Staging.PageSize, totalNumber);
+ Staging.RowsCount = totalNumber;
var data = new QueryResult(Staging, list);
result.IsSucceed = true;
result.result = data;
diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs
index 73912c2..307e253 100644
--- a/24Hour/Controllers/system/SystemControllerController.cs
+++ b/24Hour/Controllers/system/SystemControllerController.cs
@@ -59,6 +59,7 @@ namespace _24Hour.Controllers.system
[Route("QueryUser0")]
public async Task QueryUser0(App_Sys_UserInput UserModel)
{
+ RefAsync totalNumber = 0;//总数据
var userlist = new List();
var Unitlist = await _db.Queryable().Where(q => q.IsDelete == 0).ToListAsync();
@@ -69,7 +70,8 @@ namespace _24Hour.Controllers.system
.WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties))
.WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId))
.Where(q => q.IsDeleted == 0 && q.usertype == 0)
- .ToPageListAsync(UserModel.PageIndex, UserModel.PageSize);
+ .ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber);
+ UserModel.RowsCount = totalNumber;
list.ForEach(q => {
var Unitdata = Unitlist.Where(x => x.Id == q.unitCode)?.FirstOrDefault();
var Departdata = Departlist.Where(x => x.Id == q.department)?.FirstOrDefault();
@@ -386,10 +388,12 @@ namespace _24Hour.Controllers.system
[Route("QueryRole")]
public async Task QueryRole(App_Sys_RoleInput roledata)
{
+ RefAsync totalNumber = 0;//总数据
var list = await _db.Queryable()
.WhereIF(roledata.name.NotNull(), q => q.name.Contains(roledata.name))
.WhereIF(roledata.unitCode.NotNull(), q => q.unitCode.Contains(roledata.unitCode))
- .Where(q => q.IsDeleted == 0).ToPageListAsync(roledata.PageIndex, roledata.PageSize);
+ .Where(q => q.IsDeleted == 0).ToPageListAsync(roledata.PageIndex, roledata.PageSize, totalNumber);
+ roledata.RowsCount = totalNumber;
var data = new QueryResult(roledata, list);
result.IsSucceed = true;
result.result = data;
@@ -874,13 +878,15 @@ namespace _24Hour.Controllers.system
[Route("QueryDepart")]
public async Task QueryDepart(App_Sys_DepartInput Departdata)
{
+ RefAsync totalNumber = 0;//总数据
var list = await _db.Queryable()
.WhereIF(!Departdata.departCode.IsNull(), q => q.departCode.Contains(Departdata.departCode))
.WhereIF(!Departdata.departjc.IsNull(), q => q.departjc.Contains(Departdata.departjc))
.WhereIF(!Departdata.departname.IsNull(), q => q.departname.Contains(Departdata.departname))
.WhereIF(!Departdata.unitId.IsNull(), q => q.unitId.Contains(Departdata.unitId))
.WhereIF(Departdata.StartTime != null && Departdata.EndTime != null, q => q.createtime >= Departdata.StartTime && q.createtime < Departdata.EndTime.Value.AddDays(1))
- .Where(q => q.IsDelete == 0).ToPageListAsync(Departdata.PageIndex, Departdata.PageSize);
+ .Where(q => q.IsDelete == 0).ToPageListAsync(Departdata.PageIndex, Departdata.PageSize, totalNumber);
+ Departdata.RowsCount = totalNumber;
var data = new QueryResult(Departdata, list);
result.IsSucceed = true;
result.result = data;
@@ -1031,10 +1037,12 @@ namespace _24Hour.Controllers.system
{
try
{
+ RefAsync totalNumber = 0;//总数据
var list = await _db.Queryable()
.WhereIF(!Menudata.name.IsNull(), q => q.name.Contains(Menudata.name))
.WhereIF(!Menudata.pid.IsNull(), q => q.pid.Contains(Menudata.pid))
- .Where(q => q.IsDelete == 0).ToPageListAsync(Menudata.PageIndex, Menudata.PageSize);
+ .Where(q => q.IsDelete == 0).ToPageListAsync(Menudata.PageIndex, Menudata.PageSize, totalNumber);
+ Menudata.RowsCount = totalNumber;
var data = new QueryResult(Menudata, list.OrderByDescending(q => q.createtime).ToList());
result.IsSucceed = true;
diff --git a/24Hour/Program.cs b/24Hour/Program.cs
index aaa4662..a3b2a32 100644
--- a/24Hour/Program.cs
+++ b/24Hour/Program.cs
@@ -74,11 +74,6 @@ builder.Services.AddSwaggerGen(c =>
});
});
#endregion
-
-builder.Services.AddMvc(config =>
-{
- config.Filters.Add(new AllowAnonymousFilter());
-});
// ÿ
//builder.Services.AddCors(options => options.AddPolicy("CorsPolicy",
//c =>
@@ -146,7 +141,7 @@ builder.Services.AddAuthentication(options =>
}).AddScheme(nameof(ResponseAuthenticationHandler), o => { });
-builder.Services.AddAuthorization();
+//builder.Services.AddAuthorization();
builder.Services.AddHttpContextAccessor();
builder.Services.AddScoped();
builder.Services.TryAddSingleton(); //jwt
diff --git a/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/17.log b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/17.log
new file mode 100644
index 0000000..f7cf3e4
--- /dev/null
+++ b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/17.log
@@ -0,0 +1,36 @@
+日志时间:2023-06-20 17:27:15
+************************Exception Start********************************
+Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常
+Exception Date:2023/6/20 17:27:15
+Exception Type:MySqlConnector.MySqlException
+Exception Message:Data too long for column 'OperatingManual' at row 1
+Exception Source:SqlSugar
+Exception StackTrace: at SqlSugar.AdoProvider.ExecuteCommand(String sql, SugarParameter[] parameters)
+ at SqlSugar.InsertableProvider`1.ExecuteCommand()
+ at Elight.Logic.WriteSysLog.WriteSysLogadd(String operationType, String content, Result result, SqlSugarClient _db, String opeCasDepAccCas) in E:\Code\24Hour.Service\Elight.Logic\WriteSysLog.cs:line 52
+************************Exception End************************************
+
+日志时间:2023-06-20 17:38:26
+************************Exception Start********************************
+Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常
+Exception Date:2023/6/20 17:38:26
+Exception Type:MySqlConnector.MySqlException
+Exception Message:Data too long for column 'OperatingManual' at row 1
+Exception Source:SqlSugar
+Exception StackTrace: at SqlSugar.AdoProvider.ExecuteCommand(String sql, SugarParameter[] parameters)
+ at SqlSugar.InsertableProvider`1.ExecuteCommand()
+ at Elight.Logic.WriteSysLog.WriteSysLogadd(String operationType, String content, Result result, SqlSugarClient _db, String opeCasDepAccCas) in E:\Code\24Hour.Service\Elight.Logic\WriteSysLog.cs:line 52
+************************Exception End************************************
+
+日志时间:2023-06-20 17:38:36
+************************Exception Start********************************
+Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常
+Exception Date:2023/6/20 17:38:36
+Exception Type:MySqlConnector.MySqlException
+Exception Message:Data too long for column 'OperatingManual' at row 1
+Exception Source:SqlSugar
+Exception StackTrace: at SqlSugar.AdoProvider.ExecuteCommand(String sql, SugarParameter[] parameters)
+ at SqlSugar.InsertableProvider`1.ExecuteCommand()
+ at Elight.Logic.WriteSysLog.WriteSysLogadd(String operationType, String content, Result result, SqlSugarClient _db, String opeCasDepAccCas) in E:\Code\24Hour.Service\Elight.Logic\WriteSysLog.cs:line 52
+************************Exception End************************************
+
diff --git a/Elight.Entity/AppMode/App_ReceptionModel.cs b/Elight.Entity/AppMode/App_ReceptionModel.cs
index aef9d9e..9ef8750 100644
--- a/Elight.Entity/AppMode/App_ReceptionModel.cs
+++ b/Elight.Entity/AppMode/App_ReceptionModel.cs
@@ -25,7 +25,7 @@ namespace Elight.Entity
[DataMember]
public string? unitId { get; set; }
///
- /// 会见人手机号
+ /// 预约手机号
///
[DataMember]
public string? phone { get; set; }
diff --git a/Elight.Logic/Model/Commonpage.cs b/Elight.Logic/Model/Commonpage.cs
index cc4d8f9..a13dba1 100644
--- a/Elight.Logic/Model/Commonpage.cs
+++ b/Elight.Logic/Model/Commonpage.cs
@@ -46,6 +46,18 @@ namespace Elight.Logic
[DataMember]
public string? matter { get; set; }
+ ///
+ /// 预约人
+ ///
+ [DataMember]
+ public string? username { get; set; }
+
+ ///
+ /// 办理人
+ ///
+ [DataMember]
+ public string? handleuser { get; set; }
+
///
/// 预约类型
///