diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs
new file mode 100644
index 0000000..1b6e40a
--- /dev/null
+++ b/24Hour/Controllers/Common/CommonController.cs
@@ -0,0 +1,215 @@
+using Elight.Entity;
+using Elight.Logic;
+using Elight.Utility;
+using Elight.Utility.Code;
+using Elight.Utility.Extensions;
+using Elight.Utility.logs;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+
+namespace _24Hour.Controllers.Common
+{
+ ///
+ /// 通用接口
+ ///
+ [Authorize]
+ [ApiController]
+ [Route("api/Common")]
+ public class CommonController : Controller
+ {
+ #region Identity
+ private readonly SqlSugarClient _db;//数据库
+ private readonly WriteSysLog _logs;//操作日志
+ App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户
+ private readonly ILogger _logger;//日志
+ Result result = new Result();
+ public CommonController(ILogger logger, SqlSugarClient db, WriteSysLog logs, User user)
+ {
+ _logger = logger;
+ _db = db;
+ _logs = logs;
+ _userdata = user.Userdata();
+ }
+
+ #endregion
+
+ #region 最近待办
+ ///
+ /// 获取所有预约信息
+ ///
+ [HttpGet]
+ [Route("Addqueryreservation")]
+ public async Task Addqueryreservation(int? state)
+ {
+ try
+ {
+ var list = new List();
+ //获取工作台信息
+ var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync();
+ //获取律师服务预约记录
+ var Lawyerdata = await _db.Queryable()
+ .WhereIF(state.IsNotEmptyOrNull(), x => x.state == state)
+ .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.Id).ToArrayAsync();
+ Lawyerdata.ToList().ForEach(q =>
+ {
+ var da = Stagingdata.Where(x => x.Id == q.receptionId).FirstOrDefault();
+ list.Add(new
+ {
+ Id = q.Id,
+ name = da?.title,
+ color = da?.color,
+ icon = da?.icon,
+ matter = q.matter,
+ state = q.state,
+ sttime = q.receptiontime,
+ ettime = "",
+ creationtime = q.creationtime
+ });
+ });
+ //获取远程会见预约记录
+ var Remotedata = await _db.Queryable()
+ .WhereIF(state.IsNotEmptyOrNull(), x => x.state == state)
+ .Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.Id).ToArrayAsync();
+ Remotedata.ToList().ForEach(q =>
+ {
+ var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
+ list.Add(new
+ {
+ Id = q.Id,
+ name = da?.title,
+ color = da?.color,
+ icon = da?.icon,
+ matter = q.name,
+ sttime = q.sttime,
+ ettime = q.ettime,
+ state = q.state,
+ creationtime = q.creationtime
+ });
+ });
+ //获取远程接待预约记录
+ var Receptiondata = await _db.Queryable()
+ .WhereIF(state.IsNotEmptyOrNull(), x => x.state == state)
+ .Where(q => q.IsDeleted == 0 && q.meetwitId == _userdata.Id).ToArrayAsync();
+ Receptiondata.ToList().ForEach(q =>
+ {
+ var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault();
+ list.Add(new
+ {
+ Id = q.Id,
+ name = da?.title,
+ color = da?.color,
+ icon = da?.icon,
+ matter = q.matter,
+ sttime = q.sttime,
+ ettime = q.ettime,
+ state = q.state,
+ creationtime = q.creationtime
+ });
+ });
+ //获取听证服务预约记录
+ var Hearingdata = await _db.Queryable()
+ .WhereIF(state.IsNotEmptyOrNull(), x => x.state == state)
+ .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.Id).ToArrayAsync();
+ Hearingdata.ToList().ForEach(q =>
+ {
+ var da = Stagingdata.Where(x => x.Id == q.receptionId).FirstOrDefault();
+ list.Add(new
+ {
+ Id = q.Id,
+ name = da?.title,
+ color = da?.color,
+ icon = da?.icon,
+ matter = q.casename,
+ sttime = q.reservationtime,
+ ettime ="",
+ state = q.state,
+ creationtime = q.creationtime
+ });
+ });
+ result.IsSucceed = true;
+ result.result = list.ToList().OrderByDescending(q => q.creationtime).ToList();
+
+ }
+ catch (System.Exception ex)
+ {
+ _db.RollbackTran();
+ result.IsSucceed = false;
+ result.Message = ex.Message;
+ }
+ _logs.WriteSysLogadd("所有预约信息", "所有预约信息", result, _db);
+ return result;
+ }
+
+
+
+ ///
+ /// 根据Id分配办理人
+ ///
+ /// 预约信息Id
+ /// 办理人Id
+ /// 办理人
+ ///
+ [HttpGet]
+ [Route("Updateuser")]
+ public async Task Updateuser(string? Id, string? userId,string? username)
+ {
+ try
+ {
+ //律师服务
+ var Lawyerbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync();
+ if (Lawyerbol.Count() > 0)
+ {
+ Lawyerbol.FirstOrDefault().receptionuser = userId;
+ _db.BeginTran();
+ var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync();
+ _db.CommitTran();
+ if (num > 0)
+ {
+ result.IsSucceed = true;
+ result.result = "修改成功";
+ }
+ }
+ //听证服务
+ var Hearingbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync();
+ if (Hearingbol.Count() > 0)
+ {
+ Hearingbol.FirstOrDefault().receptionuser = userId;
+ _db.BeginTran();
+ var num = await _db.Updateable(Hearingbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync();
+ _db.CommitTran();
+ if (num > 0)
+ {
+ result.IsSucceed = true;
+ result.result = "修改成功";
+ }
+ }
+ //远程会见
+ var RemoteModelbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync();
+ if (RemoteModelbol.Count() > 0)
+ {
+ RemoteModelbol.FirstOrDefault().meetwitId = userId;
+ RemoteModelbol.FirstOrDefault().meetwitId = username;
+ _db.BeginTran();
+ var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync();
+ _db.CommitTran();
+ if (num > 0)
+ {
+ result.IsSucceed = true;
+ result.result = "修改成功";
+ }
+ }
+ }
+ catch (System.Exception ex)
+ {
+ _db.RollbackTran();
+ result.IsSucceed = false;
+ result.Message = ex.Message;
+ LogService.WriteLog(ex, "修改律师服务预约办理人");
+ }
+ _logs.WriteSysLogadd("律师服务", "修改律师服务预约办理人", result, _db);
+ return result;
+ }
+ #endregion
+ }
+}
diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs
index 2be8815..721c8d2 100644
--- a/24Hour/Controllers/Common/LawyerservicesController.cs
+++ b/24Hour/Controllers/Common/LawyerservicesController.cs
@@ -198,9 +198,9 @@ namespace _24Hour.Controllers.Common
var Lawyerbol = await _db.Queryable().Where(q=>q.Id==Id).ToListAsync();
if (Lawyerbol.Count()>0)
{
- Lawyerbol.FirstOrDefault().objectstr = transactors;
+ Lawyerbol.FirstOrDefault().receptionuser = transactors;
_db.BeginTran();
- var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.objectstr}).ExecuteCommandAsync();
+ var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync();
_db.CommitTran();
if (num > 0)
{
diff --git a/24Hour/Controllers/Common/RemoteController.cs b/24Hour/Controllers/Common/RemoteController.cs
index b354d91..447b860 100644
--- a/24Hour/Controllers/Common/RemoteController.cs
+++ b/24Hour/Controllers/Common/RemoteController.cs
@@ -234,8 +234,8 @@ namespace _24Hour.Controllers.Common
/// 办理人名称
///
[HttpGet]
- [Route("UpdateLawyeruser")]
- public async Task UpdateLawyeruser(string? Id, string? meetwitId,string? meetwitname)
+ [Route("UpdateRemoteuser")]
+ public async Task UpdateRemoteuser(string? Id, string? meetwitId,string? meetwitname)
{
try
{
@@ -278,8 +278,8 @@ namespace _24Hour.Controllers.Common
/// 办理人名称
///
[HttpGet]
- [Route("UpdateLawyeruser")]
- public async Task UpdateLawyerstate(App_Remoteput Remoteput)
+ [Route("UpdateRemotestate")]
+ public async Task UpdateRemotestate(App_Remoteput Remoteput)
{
try
{
diff --git a/24Hour/Controllers/Common/ReservationController.cs b/24Hour/Controllers/Common/ReservationController.cs
index 4c25f7e..535b1e7 100644
--- a/24Hour/Controllers/Common/ReservationController.cs
+++ b/24Hour/Controllers/Common/ReservationController.cs
@@ -49,17 +49,16 @@ namespace _24Hour.Controllers.Common
var app_staging = await _db.Queryable().Where(w => w.IsDelete == 0).ToListAsync();
//查询预约接待记录
var list = await _db.Queryable()
- .WhereIF(!string.IsNullOrEmpty(Reception.depart), q => q.depart.Contains(Reception.depart))
- .WhereIF(!string.IsNullOrEmpty(Reception.createusername), q => q.createusername.Contains(Reception.createusername))
- .WhereIF(!string.IsNullOrEmpty(Reception.receptionId), q => q.receptionId.Contains(Reception.receptionId))
+ .WhereIF(!string.IsNullOrEmpty(Reception.matter), q => q.matter.Contains(Reception.matter))
+ .WhereIF(!string.IsNullOrEmpty(Reception.meetwitname), q => q.meetwitname.Contains(Reception.meetwitname))
.WhereIF(Reception.state != null, q => q.state == Reception.state)
- .Where(q => q.IsDelete == 0).ToPageListAsync(Reception.PageIndex, Reception.PageSize);
+ .Where(q => q.IsDeleted == 0).ToPageListAsync(Reception.PageIndex, Reception.PageSize);
list.ForEach(q =>
{
- var data = app_staging.Where(a => a.Id == q.receptionId).FirstOrDefault();
+ var data = app_staging.Where(a => a.Id == q.reservationId).FirstOrDefault();
if (data != null)
{
- q.receptionId = data.title;
+ q.reservationId = data.title;
Receptionlist.Add(q);
}
});
@@ -146,7 +145,7 @@ namespace _24Hour.Controllers.Common
var Receptionlist = await _db.Queryable().In(q => q.Id, Currency.id).ToListAsync();
Receptionlist.ForEach(q =>
{
- q.IsDelete = 1;
+ q.IsDeleted = 1;
});
var num = await _db.Updateable(Receptionlist).ExecuteCommandAsync();
_db.CommitTran();
diff --git a/24Hour/Controllers/Common/StagingController.cs b/24Hour/Controllers/Common/StagingController.cs
index a1473dd..ee642da 100644
--- a/24Hour/Controllers/Common/StagingController.cs
+++ b/24Hour/Controllers/Common/StagingController.cs
@@ -1,10 +1,14 @@
-using Elight.Entity;
+using com.sun.org.apache.xml.@internal.dtm.@ref;
+using com.sun.xml.@internal.bind.v2.model.core;
+using Elight.Entity;
using Elight.Logic;
using Elight.Utility;
using Elight.Utility.Code;
+using Elight.Utility.Extensions;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
+using sun.net.www.content.image;
namespace _24Hour.Controllers.Common
{
@@ -80,7 +84,7 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = false;
result.Message = ex.Message;
}
- _logs.WriteSysLogadd("工作台添加", "添加工作台", result,_db);
+ _logs.WriteSysLogadd("工作台添加", "添加工作台", result, _db);
return result;
}
@@ -110,7 +114,7 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = false;
result.Message = ex.Message;
}
- _logs.WriteSysLogadd("工作台", "修改工作台信息", result,_db);
+ _logs.WriteSysLogadd("工作台", "修改工作台信息", result, _db);
return result;
}
@@ -145,7 +149,7 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = false;
result.Message = ex.Message;
}
- _logs.WriteSysLogadd("工作台", "删除工作台信息", result,_db);
+ _logs.WriteSysLogadd("工作台", "删除工作台信息", result, _db);
return result;
}
@@ -206,7 +210,7 @@ namespace _24Hour.Controllers.Common
result.IsSucceed = false;
result.Message = ex.Message;
}
- _logs.WriteSysLogadd("工作台_使用数据", "更新或则添加使用次数", result,_db);
+ _logs.WriteSysLogadd("工作台_使用数据", "更新或则添加使用次数", result, _db);
return result;
}
///
@@ -242,5 +246,6 @@ namespace _24Hour.Controllers.Common
return result;
}
#endregion
+
}
}
diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs
index ab45e14..bb9eeb7 100644
--- a/24Hour/Controllers/system/SystemControllerController.cs
+++ b/24Hour/Controllers/system/SystemControllerController.cs
@@ -37,6 +37,20 @@ namespace _24Hour.Controllers.system
#endregion
#region 用户管理
///
+ /// 系统用户list查询
+ ///
+ ///
+ ///
+ [HttpGet]
+ [Route("QueryUserlist")]
+ public async Task QueryUserlist()
+ {
+ var Unitlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.usertype == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode).ToListAsync();
+ result.IsSucceed = true;
+ result.result = Unitlist.OrderByDescending(q=>q.createtime).ToList();
+ return result;
+ }
+ ///
/// 系统用户分页查询
///
///
diff --git a/Elight.Entity/AppMode/App_ReceptionModel.cs b/Elight.Entity/AppMode/App_ReceptionModel.cs
index a337835..aef9d9e 100644
--- a/Elight.Entity/AppMode/App_ReceptionModel.cs
+++ b/Elight.Entity/AppMode/App_ReceptionModel.cs
@@ -19,43 +19,67 @@ namespace Elight.Entity
[DataMember]
[SugarColumn(IsPrimaryKey = true)]
public string? Id { get; set; }
+ ///
+ /// 单位Id
+ ///
+ [DataMember]
+ public string? unitId { get; set; }
+ ///
+ /// 会见人手机号
+ ///
+ [DataMember]
+ public string? phone { get; set; }
+
+ ///
+ /// 预约事由
+ ///
+ [DataMember]
+ public string? matter { get; set; }
+
+ [DataMember]
+ public string? reason { get; set; }
///
- /// 预约时间
+ /// 开始时间
///
[DataMember]
- public DateTime? receptiontime { get; set; }
+ public DateTime? sttime { get; set; }
///
- /// 部门
+ /// 结束时间
///
[DataMember]
- public string? depart { get; set; }
+ public DateTime? ettime { get; set; }
///
- /// 接待人
+ /// 会见人Id
///
[DataMember]
- public string? receptionuser { get; set; }
-
+ public string? meetwitId { get; set; }
+
///
- /// 事由
+ /// 会见人
///
[DataMember]
- public string? matter { get; set; }
+ public string? meetwitname { get; set; }
///
- /// 预约接待类型
+ /// 预约类型
///
[DataMember]
- public string? receptionId { get; set; }
+ public string? reservationId { get; set; }
///
- /// 0:代办，1已完成
+ /// 备注
///
[DataMember]
- public int state { get; set; }
+ public string? notes { get; set; }
+ ///
+ /// 状态 0：待办理，1：同意，2:拒绝，3:结束
+ ///
+ [DataMember]
+ public int state { get; set; }
[DataMember]
public string? createusername { get; set; }
@@ -73,6 +97,6 @@ namespace Elight.Entity
/// 是否删除：0：未删除、1：删除
///
[DataMember]
- public int? IsDelete { get; set; } = 0;
+ public int? IsDeleted { get; set; } = 0;
}
}
diff --git a/Elight.Entity/AppMode/App_RemoteModel.cs b/Elight.Entity/AppMode/App_RemoteModel.cs
index 0c32dce..34a7013 100644
--- a/Elight.Entity/AppMode/App_RemoteModel.cs
+++ b/Elight.Entity/AppMode/App_RemoteModel.cs
@@ -41,6 +41,11 @@ namespace Elight.Entity
///
[DataMember]
public string? name { get; set; }
+ ///
+ /// 预约人手机号
+ ///
+ [DataMember]
+ public string? phone { get; set; }
[DataMember]
public string? reason { get; set; }
@@ -69,6 +74,12 @@ namespace Elight.Entity
[DataMember]
public string? meetwitname { get; set; }
+ ///
+ /// 预约类型
+ ///
+ [DataMember]
+ public string? reservationId { get; set; }
+
///
/// 备注
///
diff --git a/Elight.Logic/Model/App_ReceptionInput.cs b/Elight.Logic/Model/App_ReceptionInput.cs
index 3b1767f..3b27bda 100644
--- a/Elight.Logic/Model/App_ReceptionInput.cs
+++ b/Elight.Logic/Model/App_ReceptionInput.cs
@@ -18,51 +18,57 @@ namespace Elight.Logic
public string? Id { get; set; }
///
- /// 预约时间
+ /// 单位Id
///
[DataMember]
- public DateTime? receptiontime { get; set; }
+ public string? unitId { get; set; }
///
- /// 部门
+ /// 会见人手机号
///
[DataMember]
- public string? depart { get; set; }
+ public string? phone { get; set; }
///
- /// 接待人
+ /// 预约事由
///
[DataMember]
- public string? receptionuser { get; set; }
+ public string? matter { get; set; }
///
- /// 事由
+ /// 开始时间
///
[DataMember]
- public string? matter { get; set; }
+ public DateTime? sttime { get; set; }
///
- /// 预约接待类型
+ /// 结束时间
///
[DataMember]
- public string? receptionId { get; set; }
+ public DateTime? ettime { get; set; }
///
- /// 0:代办，1已完成
+ /// 会见人Id
///
[DataMember]
- public int? state { get; set; }
+ public string? meetwitId { get; set; }
+
+ ///
+ /// 会见人
+ ///
+ [DataMember]
+ public string? meetwitname { get; set; }
///
- /// 创建人名称
+ /// 备注
///
[DataMember]
- public string? createusername { get; set; }
+ public string? notes { get; set; }
///
- /// 创建人Id
+ /// 状态 0：待办理，1：同意，2:拒绝，3:结束
///
[DataMember]
- public string? createuserId { get; set; }
+ public int? state { get; set; }
}
}