diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index f624199..f01e72c 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -42,7 +42,7 @@ namespace _24Hour.Controllers.Common _logs = logs; _userdata = user.Userdata(); _SocketCon = SocketCon; - _Unitdata= _db.Queryable().Where(q => q.IsDelete == 0).ToList(); + _Unitdata = _db.Queryable().Where(q => q.IsDelete == 0).ToList(); } #endregion @@ -61,10 +61,10 @@ namespace _24Hour.Controllers.Common var list = new List(); //获取工作台信息 var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); - var Userdata = await _db.Queryable().Where(q => q.usertype == 0&&q.unitCode==_userdata.unitCode).ToArrayAsync(); + var Userdata = await _db.Queryable().Where(q => q.usertype == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); //获取律师服务预约记录 var Lawyerdata = await _db.Queryable() - .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToListAsync(); Lawyerdata.ToList().ForEach(q => { @@ -89,7 +89,7 @@ namespace _24Hour.Controllers.Common }); //获取远程会见预约记录 var Remotedata = await _db.Queryable() - .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); Remotedata.ToList().ForEach(q => { @@ -113,7 +113,7 @@ namespace _24Hour.Controllers.Common }); //获取远程接待预约记录 var Receptiondata = await _db.Queryable() - .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); Receptiondata.ToList().ForEach(q => { @@ -190,10 +190,10 @@ namespace _24Hour.Controllers.Common .WhereIF(Commondata.handleuser.NotNull(), x => $"{x.handleuser}".Contains(Commondata.handleuser)) .WhereIF(Commondata.StartTime != null && Commondata.EndTime != null, q => q.creationtime >= Commondata.StartTime && q.creationtime < Commondata.EndTime.Value.AddDays(1)).ToList(); Commondata.RowsCount = list.Count(); - list =list.OrderByDescending(q => q.creationtime).ToList() + list = list.OrderByDescending(q => q.creationtime).ToList() .Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); result.IsSucceed = true; - result.result =new { Paging = Commondata, Data = list.ToList() }; + result.result = new { Paging = Commondata, Data = list.ToList() }; } catch (System.Exception ex) @@ -300,16 +300,16 @@ namespace _24Hour.Controllers.Common var list = new List(); //获取工作台信息 var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); - var Userdata = await _db.Queryable().Where(q => q.IsDeleted == 0&&q.usertype==0).ToArrayAsync(); + var Userdata = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); //获取律师服务预约记录 var Lawyerdata = await _db.Queryable() - .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync(); Lawyerdata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); var userda = Userdata.Where(x => x.Id == q.receptionuser).FirstOrDefault(); - var Unitdata = _Unitdata.Where(x => x.unitCode==q.unitCode).FirstOrDefault(); + var Unitdata = _Unitdata.Where(x => x.unitCode == q.unitCode).FirstOrDefault(); list.Add(new { type = 0, @@ -382,7 +382,7 @@ namespace _24Hour.Controllers.Common }); //获取远程接待预约记录 var Receptiondata = await _db.Queryable() - .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync(); Receptiondata.ToList().ForEach(q => { @@ -501,7 +501,7 @@ namespace _24Hour.Controllers.Common }); //分页查询--如有预约类型--reservationId可筛选预约类型,预约信息Id--可筛选预约信息 list = list.Where(q => q.daId != null).WhereIF(Commondata.matter.NotNull(), x => x.matter.Contains(Commondata.matter) || x.title.Contains(Commondata.matter) || x.name.Contains(Commondata.matter) || x.objectstr.Contains(Commondata.matter) || x.lawyerunit.Contains(Commondata.matter)).OrderByDescending(q => q.creationtime).ToList(); - Commondata.RowsCount=list.Count(); + Commondata.RowsCount = list.Count(); list = list.Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); result.IsSucceed = true; result.result = new { Paging = Commondata, Data = list.ToList() }; @@ -531,8 +531,8 @@ namespace _24Hour.Controllers.Common var Userdata = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); //获取律师服务预约记录 var Lawyerdata = await _db.Queryable() - .WhereIF(Commondata.state!=null&& Commondata.state != 0, x => x.state == Commondata.state) - .WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state|| x.state == 1) + .WhereIF(Commondata.state != null && Commondata.state != 0, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1) .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.Id).ToArrayAsync(); Lawyerdata.ToList().ForEach(q => { @@ -686,9 +686,9 @@ namespace _24Hour.Controllers.Common }); //获取文书签收记录 var Documentdata = await _db.Queryable() - .WhereIF(Commondata.state != null&&Commondata.state==0, x => x.zt.Contains("03")) - .WhereIF(Commondata.state != null&&Commondata.state==1, x => x.zt.Contains("1000")) - .WhereIF(Commondata.state != null&&Commondata.state==2, x => x.zt.Contains("99")||x.zt.Contains("04")) + .WhereIF(Commondata.state != null && Commondata.state == 0, x => x.zt.Contains("03")) + .WhereIF(Commondata.state != null && Commondata.state == 1, x => x.zt.Contains("1000")) + .WhereIF(Commondata.state != null && Commondata.state == 2, x => x.zt.Contains("99") || x.zt.Contains("04")) .Where(q => q.zjhm.Contains(_userdata.cardId)).ToArrayAsync(); Documentdata.ToList().ForEach(q => { @@ -726,9 +726,9 @@ namespace _24Hour.Controllers.Common }); //获取云柜记录 var CloudCabinetdata = await _db.Queryable() - .WhereIF(Commondata.state != null&&Commondata.state==0, x => x.zt.Contains("00")) - .WhereIF(Commondata.state != null&&Commondata.state==1, x => x.zt.Contains("1000")) - .WhereIF(Commondata.state != null&&Commondata.state==2, x => x.zt.Contains("99")) + .WhereIF(Commondata.state != null && Commondata.state == 0, x => x.zt.Contains("00")) + .WhereIF(Commondata.state != null && Commondata.state == 1, x => x.zt.Contains("1000")) + .WhereIF(Commondata.state != null && Commondata.state == 2, x => x.zt.Contains("99")) .Where(q => (q.sfzh.Contains(_userdata.cardId) || q.lxhm == _userdata.phone)).ToArrayAsync(); CloudCabinetdata.ToList().ForEach(q => { @@ -754,7 +754,7 @@ namespace _24Hour.Controllers.Common state = q.zt,//状态 reason = "", sttime = unixStartTime.AddMilliseconds(long.Parse(q.cjsj)),//创建时间 - ettime = q.qjsj==null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.qjsj)).ToString("yyyy-MM-dd HH:mm"),//取件时间 + ettime = q.qjsj == null ? "" : unixStartTime.AddMilliseconds(long.Parse(q.qjsj)).ToString("yyyy-MM-dd HH:mm"),//取件时间 creationtime = unixStartTime.AddMilliseconds(long.Parse(q.cjsj)),//创建时间 receptionuser = "", username = "", @@ -805,8 +805,8 @@ namespace _24Hour.Controllers.Common }); list = list .WhereIF(Commondata.matter.NotNull(), x => x?.matter.Contains(Commondata.matter) || x?.title.Contains(Commondata.matter) || x?.name.Contains(Commondata.matter) || x?.objectstr.Contains(Commondata.matter) || x?.lawyerunit.Contains(Commondata.matter)).OrderByDescending(q => q.creationtime).ToList(); - Commondata.RowsCount=list.Count(); - list=list.Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); + Commondata.RowsCount = list.Count(); + list = list.Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); result.IsSucceed = true; result.result = new { Paging = Commondata, Data = list.ToList() }; @@ -836,7 +836,7 @@ namespace _24Hour.Controllers.Common var Userdata = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); //获取律师服务预约记录 var Lawyerdata = await _db.Queryable() - .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.Id&& q.state !=2&& q.state != 3).ToArrayAsync(); + .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.Id && q.state != 2 && q.state != 3).ToArrayAsync(); Lawyerdata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -1058,7 +1058,7 @@ namespace _24Hour.Controllers.Common //获取云柜记录 var CloudCabinetdata = await _db.Queryable() - .Where(q => q.sfzh.Contains(_userdata.cardId) || q.lxhm == _userdata.phone&& q.zt.Contains("00")).ToArrayAsync(); + .Where(q => q.sfzh.Contains(_userdata.cardId) || q.lxhm == _userdata.phone && q.zt.Contains("00")).ToArrayAsync(); CloudCabinetdata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -1095,7 +1095,7 @@ namespace _24Hour.Controllers.Common }); list = list.OrderByDescending(q => q.creationtime).ToList(); result.IsSucceed = true; - result.result =new { count = list.ToList().Count(), list = list.Take(10).ToList() }; + result.result = new { count = list.ToList().Count(), list = list.Take(10).ToList() }; } catch (System.Exception ex) @@ -1116,13 +1116,13 @@ namespace _24Hour.Controllers.Common /// 办理人Id /// 办理人 /// - [HttpGet] + [HttpPost] [Route("Updateuser")] public async Task Updateuser(UpdateuserDto dto) { try { - if (dto== null) + if (dto == null) { result.IsSucceed = false; result.result = "接受参数失败"; @@ -1134,38 +1134,45 @@ namespace _24Hour.Controllers.Common result.result = "编号不能为空"; return result; } - if (string.IsNullOrEmpty(dto.userId)) - { - result.IsSucceed = false; - result.result = "用户编号不能为空"; - return result; - } - - if (dto.time== null) + if (dto.Type == null) { result.IsSucceed = false; result.result = "确认时间不能为空"; return result; } - - if (dto.state==false && string.IsNullOrEmpty(dto.reason)) - { - result.IsSucceed = false; - result.result = "拒绝原因不能为空"; - return result; - } - + //if (string.IsNullOrEmpty(dto.userId)) + //{ + // result.IsSucceed = false; + // result.result = "用户编号不能为空"; + // return result; + //} + //if (dto.time== null) + //{ + // result.IsSucceed = false; + // result.result = "确认时间不能为空"; + // return result; + //} + //if (dto.state==false && string.IsNullOrEmpty(dto.reason)) + //{ + // result.IsSucceed = false; + // result.result = "拒绝原因不能为空"; + // return result; + //} //律师服务 var Lawyerbol = await _db.Queryable().Where(q => q.Id == dto.Id).ToListAsync(); if (Lawyerbol.Count() > 0) { - Lawyerbol.FirstOrDefault().receptionuser =dto.userId; - Lawyerbol.FirstOrDefault().receptionusername = dto.username; - Lawyerbol.FirstOrDefault().acceptancetime =dto.time; - Lawyerbol.FirstOrDefault().reason =dto.reason; - - Lawyerbol.FirstOrDefault().state =dto.state==true ? 1 : 2; - + if (dto.Type == 1) + { + Lawyerbol.FirstOrDefault().acceptancetime = dto.time; + Lawyerbol.FirstOrDefault().reason = dto.reason; + Lawyerbol.FirstOrDefault().state = dto.state == true ? 1 : 2; + } + else + { + Lawyerbol.FirstOrDefault().receptionuser = dto.userId; + Lawyerbol.FirstOrDefault().receptionusername = dto.username; + } _db.BeginTran(); var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync(); _db.CommitTran(); @@ -1180,11 +1187,18 @@ namespace _24Hour.Controllers.Common var RemoteModelbol = await _db.Queryable().Where(q => q.Id == dto.Id).ToListAsync(); if (RemoteModelbol.Count() > 0) { - RemoteModelbol.FirstOrDefault().meetwitId = dto.userId; - RemoteModelbol.FirstOrDefault().meetwitname =dto.username; - RemoteModelbol.FirstOrDefault().acceptancetime =dto.time; - RemoteModelbol.FirstOrDefault().reason =dto.reason; - RemoteModelbol.FirstOrDefault().state =dto.state==true ? 1 : 2; + + if (dto.Type == 1) + { + RemoteModelbol.FirstOrDefault().acceptancetime = dto.time; + RemoteModelbol.FirstOrDefault().reason = dto.reason; + RemoteModelbol.FirstOrDefault().state = dto.state == true ? 1 : 2; + } + else + { + RemoteModelbol.FirstOrDefault().meetwitId = dto.userId; + RemoteModelbol.FirstOrDefault().meetwitname = dto.username; + } _db.BeginTran(); var num = await _db.Updateable(RemoteModelbol.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); _db.CommitTran(); @@ -1196,14 +1210,21 @@ namespace _24Hour.Controllers.Common } //获取远程接待预约记录 var Receptiondata = await _db.Queryable() - .Where(q => q.Id== dto.Id).ToArrayAsync(); + .Where(q => q.Id == dto.Id).ToArrayAsync(); if (Receptiondata.Count() > 0) { - Receptiondata.FirstOrDefault().meetwitId = dto.userId; - Receptiondata.FirstOrDefault().meetwitname =dto.username; - Receptiondata.FirstOrDefault().acceptancetime =dto.time; - Receptiondata.FirstOrDefault().reason =dto.reason; - Receptiondata.FirstOrDefault().state =dto.state==true ? 1 : 2; + + if (dto.Type == 1) + { + Receptiondata.FirstOrDefault().acceptancetime = dto.time; + Receptiondata.FirstOrDefault().reason = dto.reason; + Receptiondata.FirstOrDefault().state = dto.state == true ? 1 : 2; + } + else + { + Receptiondata.FirstOrDefault().meetwitId = dto.userId; + Receptiondata.FirstOrDefault().meetwitname = dto.username; + } _db.BeginTran(); var num = await _db.Updateable(Receptiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); _db.CommitTran(); @@ -1218,11 +1239,17 @@ namespace _24Hour.Controllers.Common .Where(q => q.Id == dto.Id).ToArrayAsync(); if (Confessiondata.Count() > 0) { - Confessiondata.FirstOrDefault().meetwitId = dto.userId; - Confessiondata.FirstOrDefault().meetwitname = dto.username; - Confessiondata.FirstOrDefault().acceptancetime =dto.time; - Confessiondata.FirstOrDefault().reason =dto.reason; - Confessiondata.FirstOrDefault().state =dto.state==true ? 1 : 2; + if (dto.Type == 1) + { + Confessiondata.FirstOrDefault().acceptancetime = dto.time; + Confessiondata.FirstOrDefault().reason = dto.reason; + Confessiondata.FirstOrDefault().state = dto.state == true ? 1 : 2; + } + else + { + Confessiondata.FirstOrDefault().meetwitId = dto.userId; + Confessiondata.FirstOrDefault().meetwitname = dto.username; + } _db.BeginTran(); var num = await _db.Updateable(Confessiondata.FirstOrDefault()).UpdateColumns(it => new { it.meetwitId, it.meetwitname }).ExecuteCommandAsync(); _db.CommitTran(); @@ -1237,11 +1264,18 @@ namespace _24Hour.Controllers.Common .Where(q => q.Id == dto.Id).ToArrayAsync(); if (Hearingdata.Count() > 0) { - Hearingdata.FirstOrDefault().receptionuser = dto.userId; - Hearingdata.FirstOrDefault().receptionusername = dto.username; - Hearingdata.FirstOrDefault().acceptancetime =dto.time; - Hearingdata.FirstOrDefault().reason =dto.reason; - Hearingdata.FirstOrDefault().state =dto.state==true ? 1 : 2; + + if (dto.Type == 1) + { + Hearingdata.FirstOrDefault().acceptancetime = dto.time; + Hearingdata.FirstOrDefault().reason = dto.reason; + Hearingdata.FirstOrDefault().state = dto.state == true ? 1 : 2; + } + else + { + Hearingdata.FirstOrDefault().receptionuser = dto.userId; + Hearingdata.FirstOrDefault().receptionusername = dto.username; + } _db.BeginTran(); var num = await _db.Updateable(Hearingdata.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername }).ExecuteCommandAsync(); _db.CommitTran(); @@ -1279,7 +1313,7 @@ namespace _24Hour.Controllers.Common 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.state != null, x => x.state == Commondata.state) .WhereIF(!Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) .WhereIF(Commondata.unitId.NotNull(), x => x.receptionuser == _userdata.Id) .Where(q => q.IsDeleted == 0).ToArrayAsync(); @@ -1306,7 +1340,7 @@ namespace _24Hour.Controllers.Common }); //获取远程会见预约记录--判断单位，查询不同数据信息 var Remotedata = await _db.Queryable() - .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) .WhereIF(!Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) .WhereIF(Commondata.unitId.NotNull(), x => x.meetwitId == _userdata.Id) .Where(q => q.IsDeleted == 0).ToArrayAsync(); @@ -1333,7 +1367,7 @@ namespace _24Hour.Controllers.Common }); //获取远程接待预约记录--判断单位，查询不同数据信息 var Receptiondata = await _db.Queryable() - .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) + .WhereIF(Commondata.state != null, x => x.state == Commondata.state) .WhereIF(!Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) .WhereIF(Commondata.unitId.NotNull(), x => x.meetwitId == _userdata.Id) .Where(q => q.IsDeleted == 0).ToArrayAsync(); @@ -1463,7 +1497,7 @@ namespace _24Hour.Controllers.Common }); }); //查询 - list =list.ToList().WhereIF(Commondata.matter.NotNull(), q => q.matter.Contains(Commondata.matter)|| q.objectstr.Contains(Commondata.matter) || q.title.Contains(Commondata.matter)).ToList(); + 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(); diff --git a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user index c5b07c2..91ac925 100644 --- a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\24小时发布 - True|2023-06-30T02:20:34.2470363Z;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; + True|2023-06-30T10:44:10.1995292Z;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; \ No newline at end of file diff --git a/Elight.Entity/SystemModel/UpdateuserDto.cs b/Elight.Entity/SystemModel/UpdateuserDto.cs index 5ace1c9..e94c483 100644 --- a/Elight.Entity/SystemModel/UpdateuserDto.cs +++ b/Elight.Entity/SystemModel/UpdateuserDto.cs @@ -36,5 +36,7 @@ namespace Elight.Entity.SystemModel /// 选择时间 /// public DateTime? time { get; set; } + + public int? Type { get; set; } } }