diff --git a/24Hour/Controllers/Common/CloudCabinetController.cs b/24Hour/Controllers/Common/CloudCabinetController.cs index 4a86c44..0c3e516 100644 --- a/24Hour/Controllers/Common/CloudCabinetController.cs +++ b/24Hour/Controllers/Common/CloudCabinetController.cs @@ -54,6 +54,7 @@ namespace _24Hour.Controllers.Common .WhereIF(cabinetdata.xm.NotNull(), q => q.xm.Contains(cabinetdata.xm)) .WhereIF(cabinetdata.lxhm.NotNull(), q => q.lxhm.Contains(cabinetdata.lxhm)) .WhereIF(cabinetdata.zt.NotNull(), q => q.zt.Contains(cabinetdata.zt)) + .WhereIF(cabinetdata.dwbm.NotNull(), q => q.dwbm.Contains(cabinetdata.dwbm)) .Where(q=>q.sfzh.Contains(_userdata.cardId)|| q.sfzh.Contains(_userdata.phone)) .ToPageListAsync(cabinetdata.PageIndex, cabinetdata.PageSize, totalNumber); cabinetdata.RowsCount = totalNumber; diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index 4678489..0df02f2 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -1406,6 +1406,223 @@ namespace _24Hour.Controllers.Common } #endregion + #region 自主查询一体机 + /// + /// app---根据当前登录人查询预约信息--自主查询---一体机 + /// + [HttpPost] + [Route("querylistytj")] + public async Task querylistytj(Commonpage Commondata) + { + try + { + var list = new List(); + //获取工作台信息 + var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); + //获取律师服务预约记录--判断单位,查询不同数据信息 + var Lawyerdata = await _db.Queryable() + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) + .WhereIF(Commondata.unitId.NotNull(), x => x.unitCode.Contains(Commondata.unitId)) + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); + Lawyerdata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.unitCode).FirstOrDefault(); + list.Add(new + { + type = 0, + Id = q.Id, + Unitname = Unitdata?.unitname, + title = da?.title, + path = da?.path, + color = da?.color, + icon = da?.icon, + objectstr = q.objectstr, + matter = q.matter, + state = q.state, + sttime = q.receptiontime, + ettime = "", + creationtime = q.creationtime + }); + }); + //获取远程会见预约记录--判断单位,查询不同数据信息 + var Remotedata = await _db.Queryable() + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) + .WhereIF(Commondata.unitId.NotNull(), x => x.unitCode.Contains(Commondata.unitId)) + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); + Remotedata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.unitCode).FirstOrDefault(); + list.Add(new + { + type = 1, + Id = q.Id, + Unitname = Unitdata?.unitname, + title = da?.title, + path = da?.path, + color = da?.color, + icon = da?.icon, + matter = q.name, + objectstr = "", + sttime = q.sttime, + ettime = q.ettime, + state = q.state, + creationtime = q.creationtime + }); + }); + //获取远程接待预约记录--判断单位,查询不同数据信息 + var Receptiondata = await _db.Queryable() + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) + .WhereIF(Commondata.unitId.NotNull(), x => x.unitCode.Contains(Commondata.unitId)) + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); + Receptiondata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.unitCode).FirstOrDefault(); + list.Add(new + { + type = 2, + Id = q.Id, + Unitname = Unitdata?.unitname, + title = da?.title, + path = da?.path, + color = da?.color, + icon = da?.icon, + matter = q.matter, + objectstr = "", + sttime = q.sttime, + ettime = q.ettime, + state = q.state, + creationtime = q.creationtime + }); + }); + + //获取认罪认罚预约记录--判断单位,查询不同数据信息 + var Confessiondata = await _db.Queryable() + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) + .WhereIF(Commondata.unitId.NotNull(), x => x.unitCode.Contains(Commondata.unitId)) + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); + Confessiondata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.unitCode).FirstOrDefault(); + list.Add(new + { + type = 6, + Id = q.Id, + Unitname = Unitdata?.unitname, + title = da?.title, + path = da?.path, + color = da?.color, + icon = da?.icon, + matter = q.matter, + objectstr = "", + sttime = q.sttime, + ettime = "", + state = q.state, + creationtime = q.creationtime + }); + }); + //获取听证预约记录 + var Hearingdata = await _db.Queryable() + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) + .WhereIF(Commondata.unitId.NotNull(), x => x.unitCode.Contains(Commondata.unitId)) + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); + Hearingdata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.unitCode).FirstOrDefault(); + list.Add(new + { + type = 3, + Id = q.Id, + Unitname = Unitdata?.unitname, + title = da?.title, + path = da?.path, + color = da?.color, + icon = da?.icon, + matter = q.witnessrequest, + objectstr = "", + sttime = q.reservationtime, + ettime = "", + state = q.state, + creationtime = q.creationtime + }); + }); + //获取文书签收记录 + var Documentdata = await _db.Queryable() + .WhereIF(Commondata.unitId.NotNull(), x => x.dwbm.Contains(Commondata.unitId)) + .Where(q => q.zjhm.Contains(_userdata.cardId)).ToArrayAsync(); + Documentdata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.dwbm).FirstOrDefault(); + list.Add(new + { + type = 4, + Id = q.Id, + Unitname = Unitdata?.unitname, + title = da?.title, + path = da?.path, + color = da?.color, + icon = da?.icon, + matter = q.wsmc, + objectstr = q.ajmc, + sttime = "", + ettime = "", + state = q.zt, + creationtime = unixStartTime.AddMilliseconds(long.Parse(q.zhxgsj)),//最新时间 + }); + }); + + //获取云柜记录 + var CloudCabinetdata = await _db.Queryable() + .WhereIF(Commondata.unitId.NotNull(), x => x.dwbm.Contains(Commondata.unitId)) + .Where(q => q.sfzh.Contains(_userdata.cardId) || q.lxhm == _userdata.phone).ToArrayAsync(); + CloudCabinetdata.ToList().ForEach(q => + { + var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.dwbm).FirstOrDefault(); + list.Add(new + { + type = 5, + Id = q.Id, + Unitname = Unitdata?.unitname, + title = da?.title, + path = da?.path, + color = da?.color, + icon = da?.icon, + matter = !string.IsNullOrEmpty(q.gjkqmm) ? q.gjkqmm : q.wbkqmm,//取件码 + objectstr = "", + sttime = "", + ettime = "", + state = q.zt, + creationtime = unixStartTime.AddMilliseconds(long.Parse(q.cjsj)),//创建时间 + }); + }); + //查询 + list = list.ToList().WhereIF(Commondata.matter.NotNull(), q => q.matter.Contains(Commondata.matter) || q.objectstr.Contains(Commondata.matter) || q.title.Contains(Commondata.matter)).ToList(); + 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; + } + #endregion + #region 数据统计 /// diff --git a/24Hour/Controllers/Common/ConfessionController.cs b/24Hour/Controllers/Common/ConfessionController.cs index c1a2bb5..321e390 100644 --- a/24Hour/Controllers/Common/ConfessionController.cs +++ b/24Hour/Controllers/Common/ConfessionController.cs @@ -51,6 +51,7 @@ namespace _24Hour.Controllers.Common //查询认罪认罚记录 var list = await _db.Queryable() .WhereIF(!string.IsNullOrEmpty(Confession.matter), q => q.matter.Contains(Confession.matter)) + .WhereIF(Confession.unitId.NotNull(), q => q.unitCode.Contains(Confession.unitId)) .WhereIF(!string.IsNullOrEmpty(Confession.meetwitname), q => q.meetwitname.Contains(Confession.meetwitname)) .WhereIF(Confession.state != null, q => q.state == Confession.state) .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToPageListAsync(Confession.PageIndex, Confession.PageSize, totalNumber); diff --git a/24Hour/Controllers/Common/DocumentController.cs b/24Hour/Controllers/Common/DocumentController.cs index 011660d..106c8da 100644 --- a/24Hour/Controllers/Common/DocumentController.cs +++ b/24Hour/Controllers/Common/DocumentController.cs @@ -7,6 +7,7 @@ using Elight.Utility.logs; using javax.xml.crypto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.VisualBasic; using SqlSugar; namespace _24Hour.Controllers.Common @@ -54,7 +55,8 @@ namespace _24Hour.Controllers.Common var list = await _db.Queryable() .WhereIF(Documentdata.state.NotNull(), q => q.zt.Contains(Documentdata.state)) .WhereIF(Documentdata.name.NotNull(), q => q.wsmc.Contains(Documentdata.name)) - .Where(q => q.zjhm.Contains(_userdata.cardId)) + .WhereIF(Documentdata.unitId.NotNull(), q => q.dwbm.Contains(Documentdata.unitId)) + .Where(q => q.zjhm.Contains(_userdata.cardId)) .ToPageListAsync(Documentdata.PageIndex, Documentdata.PageSize, totalNumber); Documentdata.RowsCount = totalNumber; var data = new QueryResult(Documentdata, list.OrderByDescending(q => long.Parse(q.sdsj)).ToList()); diff --git a/24Hour/Controllers/Common/HearingController.cs b/24Hour/Controllers/Common/HearingController.cs index 13b3c04..f1ec599 100644 --- a/24Hour/Controllers/Common/HearingController.cs +++ b/24Hour/Controllers/Common/HearingController.cs @@ -51,6 +51,7 @@ namespace _24Hour.Controllers.Common .WhereIF(Hearingdata.lawyeruser != null, q => q.lawyeruser.Contains(Hearingdata.lawyeruser)) .WhereIF(Hearingdata.location != null, q => q.location.Contains(Hearingdata.location)) .WhereIF(Hearingdata.state != null, q => q.state == Hearingdata.state) + .WhereIF(Hearingdata.unitId.NotNull(), q => q.unitCode.Contains(Hearingdata.unitId)) .WhereIF(Hearingdata.StartTime != null && Hearingdata.EndTime != null, q => q.reservationtime >= Hearingdata.StartTime && q.reservationtime < Hearingdata.EndTime.Value.AddDays(1)) .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToPageListAsync(Hearingdata.PageIndex, Hearingdata.PageSize, totalNumber); Hearingdata.RowsCount = totalNumber; diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index a03fd0d..9c5628d 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -51,6 +51,7 @@ namespace _24Hour.Controllers.Common .WhereIF(Lawyeredata.name != null, q => q.name.Contains(Lawyeredata.name)) .WhereIF(Lawyeredata.objectstr != null, q => q.objectstr.Contains(Lawyeredata.objectstr)) .WhereIF(Lawyeredata.state != null, q => q.state == Lawyeredata.state) + .WhereIF(Lawyeredata.unitId.NotNull(), q => q.unitCode.Contains(Lawyeredata.unitId)) .WhereIF(Lawyeredata.StartTime != null && Lawyeredata.EndTime != null, q => q.receptiontime >= Lawyeredata.StartTime && q.receptiontime < Lawyeredata.EndTime.Value.AddDays(1)) .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToPageListAsync(Lawyeredata.PageIndex, Lawyeredata.PageSize, totalNumber); Lawyeredata.RowsCount = totalNumber; diff --git a/24Hour/Controllers/Common/RemoteController.cs b/24Hour/Controllers/Common/RemoteController.cs index 20bbac0..42b85ed 100644 --- a/24Hour/Controllers/Common/RemoteController.cs +++ b/24Hour/Controllers/Common/RemoteController.cs @@ -54,6 +54,7 @@ namespace _24Hour.Controllers.Common var list = await _db.Queryable() .WhereIF(Remotedata.Code != null, q => q.Code.Contains(Remotedata.Code)) .WhereIF(Remotedata.name != null, q => q.name.Contains(Remotedata.name)) + .WhereIF(Remotedata.unitId.NotNull(), q => q.unitCode.Contains(Remotedata.unitId)) .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.createuserId == _userdata.Id).ToPageListAsync(Remotedata.PageIndex, Remotedata.PageSize, totalNumber); diff --git a/24Hour/Controllers/Common/ReservationController.cs b/24Hour/Controllers/Common/ReservationController.cs index 7d93663..3bc8f31 100644 --- a/24Hour/Controllers/Common/ReservationController.cs +++ b/24Hour/Controllers/Common/ReservationController.cs @@ -53,6 +53,7 @@ namespace _24Hour.Controllers.Common .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) + .WhereIF(Reception.unitId.NotNull(), q => q.unitCode.Contains(Reception.unitId)) .Where(q => q.IsDeleted == 0&&q.createuserId==_userdata.Id).ToPageListAsync(Reception.PageIndex, Reception.PageSize, totalNumber); Reception.RowsCount = totalNumber; list.ForEach(q => diff --git a/24Hour/Controllers/Common/VideoController.cs b/24Hour/Controllers/Common/VideoController.cs index e9b3833..9d2bb00 100644 --- a/24Hour/Controllers/Common/VideoController.cs +++ b/24Hour/Controllers/Common/VideoController.cs @@ -2,6 +2,7 @@ using Elight.Logic; using Elight.Utility; using Elight.Utility.Code; +using Elight.Utility.Extensions; using javax.xml.crypto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; @@ -48,7 +49,7 @@ namespace _24Hour.Controllers.Common var Videolist = new List(); //查询视频举报记录 var list = await _db.Queryable() - .WhereIF(Videodata.reporting != null, q => q.reporting.Contains(Videodata.reporting)) + .WhereIF(Videodata.reporting.NotNull(), q => q.reporting.Contains(Videodata.reporting)) .WhereIF(Videodata.state != null, q => q.state == Videodata.state) .WhereIF(Videodata.StartTime != null && Videodata.EndTime != null, q => q.creationtime >= Videodata.StartTime && q.creationtime < Videodata.EndTime.Value.AddDays(1)) .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToPageListAsync(Videodata.PageIndex, Videodata.PageSize, totalNumber); @@ -84,8 +85,9 @@ namespace _24Hour.Controllers.Common var Videolist = new List(); //查询远程会见记录 var list = await _db.Queryable() - .WhereIF(Videodata.reporting != null, q => q.reporting.Contains(Videodata.reporting)) + .WhereIF(Videodata.reporting.NotNull(), q => q.reporting.Contains(Videodata.reporting)) .WhereIF(Videodata.state != null, q => q.state == Videodata.state) + .WhereIF(Videodata.unitId.NotNull(), q => q.unitCode.Contains(Videodata.unitId)) .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToPageListAsync(Videodata.PageIndex, Videodata.PageSize); list.OrderByDescending(q => q.creationtime).ToList().ForEach(q => { diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs index 4f58339..a80e6c8 100644 --- a/24Hour/Controllers/system/SystemControllerController.cs +++ b/24Hour/Controllers/system/SystemControllerController.cs @@ -642,18 +642,23 @@ namespace _24Hour.Controllers.system /// [HttpPost] [Route("AddRoleUser")] - public async Task AddRoleUser(List RoleUserlist) + public async Task AddRoleUser(App_Sys_RoleUserAdd RoleUser) { try { + //查询角色下的菜单 + var list = await _db.Queryable().Where(q => q.roleId == RoleUser.roleId).ToListAsync(); _db.BeginTran(); - RoleUserlist.ForEach(RoleMenudata => + //删除角色下的菜单 + await _db.Deleteable(list).ExecuteCommandAsync(); + RoleUser.roleuserlist.ForEach(RoleUserdata => { - RoleMenudata.Id = Guid.NewGuid().ToString(); - RoleMenudata.userId = _userdata.Id.ToString(); - RoleMenudata.username = _userdata.name; + RoleUserdata.Id = Guid.NewGuid().ToString(); + RoleUserdata.roleuserId = RoleUser.roleId; + RoleUserdata.userId = _userdata.Id.ToString(); + RoleUserdata.username = _userdata.name; }); - var num = await _db.Insertable(RoleUserlist).ExecuteCommandAsync(); + var num = await _db.Insertable(RoleUser.roleuserlist).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { diff --git a/Elight.Logic/Job/WsJob.cs b/Elight.Logic/Job/WsJob.cs index ee0457e..10882bf 100644 --- a/Elight.Logic/Job/WsJob.cs +++ b/Elight.Logic/Job/WsJob.cs @@ -104,7 +104,7 @@ namespace Elight.Logic.Job }); _db.BeginTran(); await _db.Insertable(nobhwslist).ExecuteCommandAsync(); - await _db.Updateable(bhwslist).ExecuteCommandAsync(); + await _db.Updateable(bhwslist).UpdateColumns(it => new { it.zt, it.zhxgsj, it.qmsj,it.sdsj }).ExecuteCommandAsync(); _db.CommitTran(); } catch (System.Exception ex) diff --git a/Elight.Logic/Job/YgJob.cs b/Elight.Logic/Job/YgJob.cs index 864a462..9776832 100644 --- a/Elight.Logic/Job/YgJob.cs +++ b/Elight.Logic/Job/YgJob.cs @@ -44,7 +44,7 @@ namespace Elight.Logic.Job //JobDataMap datas = context.JobDetail.JobDataMap; //// 定时任务执行的代码 //Console.WriteLine("定时任务执行中..."); - //var daa = new { data = "{\"token\":\"www.archives.net.cn\",\"dwbm\":\"\",\"zt\":\"\",\"sfzh\":\"\",\"xm\":\"\",\"lxhm\":\"\",\"account\":\"\",\"gjlxhm\":\"\"}" }; + //var daa = new { data = "{\"token\":\"www.archives.net.cn\",\"dwbm\":\"\",\"zt\":\"00\",\"sfzh\":\"\",\"xm\":\"\",\"lxhm\":\"\",\"account\":\"\",\"gjlxhm\":\"\"}" }; //var msg = ""; //var data = HttpHelper.Post("http://jhg.ahjiguang.cn:80/jhg/api/user/command/jhgwbsclapi/getjhgywlist", daa, out msg); //var Results = JsonConvert.DeserializeObject(data); @@ -102,7 +102,7 @@ namespace Elight.Logic.Job }); _db.BeginTran(); await _db.Insertable(nobhyglist).ExecuteCommandAsync(); - await _db.Updateable(bhyglist).ExecuteCommandAsync(); + await _db.Updateable(bhyglist).UpdateColumns(it => new { it.zt,it.qjsj}).ExecuteCommandAsync(); _db.CommitTran(); } catch (System.Exception ex) diff --git a/Elight.Logic/SystemModel/App_Sys_RoleUserAdd.cs b/Elight.Logic/SystemModel/App_Sys_RoleUserAdd.cs new file mode 100644 index 0000000..bf3b1bc --- /dev/null +++ b/Elight.Logic/SystemModel/App_Sys_RoleUserAdd.cs @@ -0,0 +1,29 @@ +using Elight.Entity; +using Elight.Utility.Code; +using SqlSugar; +using System; +using System.Runtime.Serialization; + +namespace Elight.Logic.SystemModel +{ + /// + /// 角色用户表 + /// + [DataContract] + public class App_Sys_RoleUserAdd + { + /// + /// 角色Id + /// + [DataMember] + public string? roleId { get; set; } + + /// + /// 角色用户Id + /// + [DataMember] + public List? roleuserlist { get; set; } + + } +} +