diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index c58a72b..328eede 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -19,6 +19,7 @@ using sun.security.x509; using System.Drawing.Printing; using System.Security.AccessControl; using static com.sun.tools.@internal.xjc.reader.xmlschema.bindinfo.BIConversion; +using static sun.font.LayoutPathImpl; using User = Elight.Utility.User; namespace _24Hour.Controllers.Common @@ -226,7 +227,9 @@ namespace _24Hour.Controllers.Common list = list.WhereIF(Commondata.username.NotNull(), x => $"{x.username}".Contains(Commondata.username)) .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() .Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); result.IsSucceed = true; @@ -405,6 +408,8 @@ namespace _24Hour.Controllers.Common casetype = "", operatorId = q.operatorId, operatorName = q.operatorName, + partyIDcard = q?.partyIDcard, + party = q?.party, state = q.state, reason = q.reason, sttime = q.receptiontime, @@ -436,6 +441,8 @@ namespace _24Hour.Controllers.Common icon = da?.icon, unitCode = Unitdata?.unitCode, Unitname = Unitdata?.unitname, + partyIDcard = "", + party = "", name = q.name, phone = q.phone, matter = "",//事由 @@ -480,6 +487,8 @@ namespace _24Hour.Controllers.Common icon = da?.icon, Unitname = Unitdata?.unitname, unitCode = Unitdata?.unitCode, + partyIDcard = "", + party = "", name = "", phone = q.phone, matter = q.matter,//事由 @@ -524,6 +533,8 @@ namespace _24Hour.Controllers.Common icon = da?.icon, Unitname = Unitdata?.unitname, unitCode = Unitdata?.unitCode, + partyIDcard = "", + party = "", name = "", phone = q.phone, matter = q.matter,//事由 @@ -569,6 +580,8 @@ namespace _24Hour.Controllers.Common icon = da?.icon, Unitname = Unitdata?.unitname, unitCode = Unitdata?.unitCode, + partyIDcard = "", + party = "", name = q.lawyeruser,//律师律师名称 lawyerunit = q.lawyerunit,//律师事务所 @@ -635,14 +648,15 @@ namespace _24Hour.Controllers.Common //.WhereIF(Commondata.state != null && Commondata.state == 0, x => x.state == Commondata.state || x.state == 1) // .WhereIF(Commondata.state != null && Commondata.state == 1, x => x.state == 1) .WhereIF(Commondata.state != null, x => x.state == Commondata.state) - .WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.receptionuser == _userdata.department) + .WhereIF(!string.IsNullOrEmpty(_userdata.unitCode), x => x.unitCode == _userdata.unitCode) .WhereIF(Commondata.state != 0, x => x.operatorId == _userdata.Id || x.operatorId == null) - .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser)).ToArrayAsync(); + .Where(q => q.IsDeleted == 0 /*&& !string.IsNullOrEmpty(q.receptionuser)*/).ToArrayAsync(); //.Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department).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.FirstOrDefault(x => x.unitCode == q.unitCode); list.Add(new { type = 0, @@ -658,7 +672,10 @@ namespace _24Hour.Controllers.Common handleuser = q.receptionusername, operatorId = q.operatorId, operatorName = q.operatorName, - lawyerunit = "", + party=q.party, + partyIDcard=q.partyIDcard, + endtime=q.receptionEndtime, + lawyerunit = Unitdata?.unitname, location = "", courtname = "", casetype = "", @@ -689,6 +706,7 @@ namespace _24Hour.Controllers.Common Remotedata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.FirstOrDefault(x => x.unitCode == q.unitCode); list.Add(new { type = 1, @@ -701,9 +719,12 @@ namespace _24Hour.Controllers.Common matter = "",//事由 objectstr = "",//访问对象（案件名称） + party = "", + partyIDcard = "", + endtime = "", operatorId = q.operatorId, operatorName = q.operatorName, - lawyerunit = "", + lawyerunit = Unitdata?.unitname, location = "", courtname = "", casetype = "", @@ -736,6 +757,7 @@ namespace _24Hour.Controllers.Common Receptiondata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); + var Unitdata = _Unitdata.FirstOrDefault(x => x.unitCode == q.unitCode); list.Add(new { type = 2, @@ -748,9 +770,12 @@ namespace _24Hour.Controllers.Common matter = q.matter,//事由 objectstr = "",//访问对象（案件名称） + party = "", + partyIDcard = "", + endtime = "", operatorId = q.operatorId, operatorName = q.operatorName, - lawyerunit = "", + lawyerunit = Unitdata?.unitname, location = "", courtname = "", casetype = "", @@ -804,6 +829,9 @@ namespace _24Hour.Controllers.Common matter = q.witnessrequest,//事由 objectstr = "",//访问对象（案件名称） Code = "", + party = "", + partyIDcard = "", + endtime = "", state = q.state,//状态 reason = q.reason,//原因 sttime = q.reservationtime,//预约时间 @@ -843,6 +871,9 @@ namespace _24Hour.Controllers.Common matter = q.ajmc,//案件名称 objectstr = "",//访问对象（案件名称） Code = "", + party = "", + partyIDcard = "", + endtime = "", state = q.zt,//状态 reason = "",//原因 sttime = unixStartTime.AddMilliseconds(long.Parse(q.zhxgsj)),//时间 @@ -877,6 +908,9 @@ namespace _24Hour.Controllers.Common icon = da?.icon, name = $"{q.cljs}",//材料件数 + party = "", + partyIDcard = "", + endtime = "", lawyerunit = Unitdata?.unitname,// location = "",// phone = q.lxhm,//联系方式 @@ -921,6 +955,9 @@ namespace _24Hour.Controllers.Common matter = q.matter,//事由 objectstr = "",//访问对象（案件名称） + party = "", + partyIDcard = "", + endtime = "", operatorId = q.operatorId, operatorName = q.operatorName, lawyerunit = "", @@ -944,7 +981,7 @@ 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(); + .WhereIF(!string.IsNullOrEmpty(Commondata.matter), 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(); result.IsSucceed = true; @@ -982,8 +1019,9 @@ namespace _24Hour.Controllers.Common } //获取律师服务预约记录 - var Lawyerdata = await _db.Queryable().WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.receptionuser == _userdata.department && (x.operatorId == _userdata.Id || x.operatorId == null)) - .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser) && q.state != 2 && q.state != 3).ToArrayAsync(); + var Lawyerdata = await _db.Queryable() + //.WhereIF(!string.IsNullOrEmpty(_userdata.department), x => /*x.receptionuser == _userdata.department &&*/ (x.operatorId == _userdata.Id || x.operatorId == null)) + .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser) && q.state != 2 && q.state != 3&&q.unitCode==_userdata.unitCode).ToArrayAsync(); // .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync(); Lawyerdata.ToList().ForEach(q => { @@ -1317,33 +1355,33 @@ namespace _24Hour.Controllers.Common var Lawyerbol = await _db.Queryable().Where(q => q.Id == dto.Id).ToListAsync(); if (Lawyerbol.Count() > 0) { + var Lawyerboldata = Lawyerbol.FirstOrDefault(); if (dto.Type == 1) { - //if (Lawyerbol.FirstOrDefault().operatorId!=null) - //{ - // result.IsSucceed = false; - // result.result = "预约已受理"; - // return result; - //} - Lawyerbol.FirstOrDefault().acceptancetime = dto.time; - Lawyerbol.FirstOrDefault().reason = dto.reason; - Lawyerbol.FirstOrDefault().state = Convert.ToInt32(dto.state); - Lawyerbol.FirstOrDefault().operatorId = newmodel.Id; - Lawyerbol.FirstOrDefault().operatorName = newmodel.name; + if (Lawyerboldata.operatorId != null) + { + result.IsSucceed = false; + result.result = "预约已受理"; + return result; + } + Lawyerboldata.acceptancetime = dto.time; + Lawyerboldata.reason = dto.reason; + Lawyerboldata.state = Convert.ToInt32(dto.state); + Lawyerboldata.operatorId = newmodel.Id; + Lawyerboldata.operatorName = newmodel.name; } else { - Lawyerbol.FirstOrDefault().receptionuser = dto.userId; - Lawyerbol.FirstOrDefault().receptionusername = dto.username; + Lawyerboldata.receptionuser = dto.userId; + Lawyerboldata.receptionusername = dto.username; } var userdata = await _db.Queryable() - .Where(q => q.Id == Lawyerbol.FirstOrDefault().createuserId).ToArrayAsync(); + .Where(q => q.Id == Lawyerboldata.createuserId).ToArrayAsync(); _db.BeginTran(); - var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state, it.operatorId, it.operatorName }).ExecuteCommandAsync(); + var num = await _db.Updateable(Lawyerboldata).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state, it.operatorId, it.operatorName }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { - var Lawyerboldata = Lawyerbol.FirstOrDefault(); //获取单位信息 var unitname = _Unitdata.FirstOrDefault(q => q.unitCode == Lawyerboldata.unitCode)?.unitname; await _SocketCon.system(dto.userId); @@ -1354,7 +1392,7 @@ namespace _24Hour.Controllers.Common //判单预约人是否有微信openId if (!string.IsNullOrEmpty(userdata.FirstOrDefault()?.wechatId)) //发送晨成功订阅号消息 - _wechatMessagerClient.wxts(userdata.FirstOrDefault()?.wechatId, Lawyerboldata?.operatorName, unitname, Lawyerboldata?.receptiontime, Lawyerboldata?.objectstr +"-"+ Lawyerboldata?.matter, Lawyerboldata?.reason); + _wechatMessagerClient.wxts(userdata.FirstOrDefault()?.wechatId, Lawyerboldata?.operatorName, unitname, Lawyerboldata?.receptiontime, Lawyerboldata?.objectstr + "-" + Lawyerboldata?.matter, Lawyerboldata?.reason); } else { @@ -1372,15 +1410,14 @@ namespace _24Hour.Controllers.Common var RemoteModelbol = await _db.Queryable().Where(q => q.Id == dto.Id).ToListAsync(); if (RemoteModelbol.Count() > 0) { - if (dto.Type == 1) { - //if (RemoteModelbol.FirstOrDefault().operatorId != null) - //{ - // result.IsSucceed = false; - // result.result = "预约已受理"; - // return result; - //} + if (RemoteModelbol.FirstOrDefault().operatorId != null) + { + result.IsSucceed = false; + result.result = "预约已受理"; + return result; + } RemoteModelbol.FirstOrDefault().acceptancetime = dto.time; RemoteModelbol.FirstOrDefault().reason = dto.reason; RemoteModelbol.FirstOrDefault().state = Convert.ToInt32(dto.state); @@ -1409,12 +1446,12 @@ namespace _24Hour.Controllers.Common if (dto.Type == 1) { - //if (Receptiondata.FirstOrDefault().operatorId != null) - //{ - // result.IsSucceed = false; - // result.result = "预约已受理"; - // return result; - //} + if (Receptiondata.FirstOrDefault().operatorId != null) + { + result.IsSucceed = false; + result.result = "预约已受理"; + return result; + } Receptiondata.FirstOrDefault().acceptancetime = dto.time; Receptiondata.FirstOrDefault().reason = dto.reason; Receptiondata.FirstOrDefault().state = Convert.ToInt32(dto.state); @@ -1442,12 +1479,12 @@ namespace _24Hour.Controllers.Common { if (dto.Type == 1) { - //if (Confessiondata.FirstOrDefault().operatorId != null) - //{ - // result.IsSucceed = false; - // result.result = "预约已受理"; - // return result; - //} + if (Confessiondata.FirstOrDefault().operatorId != null) + { + result.IsSucceed = false; + result.result = "预约已受理"; + return result; + } Confessiondata.FirstOrDefault().acceptancetime = dto.time; Confessiondata.FirstOrDefault().reason = dto.reason; Confessiondata.FirstOrDefault().state = Convert.ToInt32(dto.state); @@ -1476,12 +1513,12 @@ namespace _24Hour.Controllers.Common if (dto.Type == 1) { - //if (Hearingdata.FirstOrDefault().operatorId != null) - //{ - // result.IsSucceed = false; - // result.result = "预约已受理"; - // return result; - //} + if (Hearingdata.FirstOrDefault().operatorId != null) + { + result.IsSucceed = false; + result.result = "预约已受理"; + return result; + } Hearingdata.FirstOrDefault().acceptancetime = dto.time; Hearingdata.FirstOrDefault().reason = dto.reason; Hearingdata.FirstOrDefault().state = Convert.ToInt32(dto.state); diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index e0ad768..3a439bf 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -87,7 +87,7 @@ namespace _24Hour.Controllers.Common .WhereIF(Lawyerdata?.unitId != null, q => q.unitCode.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.unitCode == _userdata.unitCode).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber); + .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).OrderByDescending(q => q.creationtime).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber); Lawyerdata.RowsCount = totalNumber; var data = new QueryResult(Lawyerdata, list.OrderByDescending(q => q.creationtime).ToList()); result.IsSucceed = true; @@ -260,16 +260,23 @@ namespace _24Hour.Controllers.Common { var Lawyerbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync(); if (Lawyerbol.Any()) - { - Lawyerbol.FirstOrDefault().receptiontime=starttime; - Lawyerbol.FirstOrDefault().receptionEndtime=endtime; + { + var Lawyerboldata = Lawyerbol.FirstOrDefault(); + if (Lawyerboldata.state !=0) + { + result.IsSucceed = true; + result.result = "数据已被其他人接收处理！"; + return result; + } + Lawyerboldata.receptiontime=starttime; + Lawyerboldata.receptionEndtime=endtime; - Lawyerbol.FirstOrDefault().state = state; + Lawyerboldata.state = state; if (reason.NotNull()) - Lawyerbol.FirstOrDefault().reason = reason; - Lawyerbol.FirstOrDefault().acceptancetime = DateTime.Now; + Lawyerboldata.reason = reason; + Lawyerboldata.acceptancetime = DateTime.Now; _db.BeginTran(); - var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.state, it.reason, it.acceptancetime ,it.receptiontime,it + var num = await _db.Updateable(Lawyerboldata).UpdateColumns(it => new { it.state, it.reason, it.acceptancetime ,it.receptiontime,it .receptionEndtime}).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0)