From 1d738dabc96a90e5fee0e2d86f09b0cf337df8d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Tue, 21 Nov 2023 20:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E6=89=80=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerservicesController.cs | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerservicesController.cs b/24Hour/Controllers/Common/LawyerservicesController.cs index b1f603a..742f41f 100644 --- a/24Hour/Controllers/Common/LawyerservicesController.cs +++ b/24Hour/Controllers/Common/LawyerservicesController.cs @@ -92,7 +92,9 @@ 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).OrderByDescending(q => q.creationtime).ToPageListAsync(Lawyerdata.PageIndex, Lawyerdata.PageSize, totalNumber); + .Where(q => q.IsDeleted == 0) + .WhereIF(_userdata.phone != "admin", q => 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; @@ -202,7 +204,7 @@ namespace _24Hour.Controllers.Common #endregion - + #region 律师预约修改办理人及状态修改 @@ -259,7 +261,7 @@ namespace _24Hour.Controllers.Common /// [HttpGet] [Route("UpdateLawyerstate")] - public async Task UpdateLawyerstate(string? Id, int state, string? reason,DateTime starttime,DateTime endtime) + public async Task UpdateLawyerstate(string? Id, int state, string? reason, DateTime starttime, DateTime endtime) { try { @@ -267,22 +269,29 @@ namespace _24Hour.Controllers.Common if (Lawyerbol.Any()) { var Lawyerboldata = Lawyerbol.FirstOrDefault(); - if (Lawyerboldata.state !=0) + if (Lawyerboldata.state != 0) { result.IsSucceed = false; result.result = "数据已被其他人接收处理！"; return result; } - Lawyerboldata.receptiontime=starttime; - Lawyerboldata.receptionEndtime=endtime; + Lawyerboldata.receptiontime = starttime; + Lawyerboldata.receptionEndtime = endtime; Lawyerboldata.state = state; if (reason.NotNull()) Lawyerboldata.reason = reason; Lawyerboldata.acceptancetime = DateTime.Now; _db.BeginTran(); - var num = await _db.Updateable(Lawyerboldata).UpdateColumns(it => new { it.state, it.reason, it.acceptancetime ,it.receptiontime,it - .receptionEndtime}).ExecuteCommandAsync(); + 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) { @@ -291,19 +300,19 @@ namespace _24Hour.Controllers.Common //获取单位信息 var unitname = _Unitdata.FirstOrDefault(q => q.unitCode == Lawyerboldata.unitCode)?.unitname; if (state == 1) - { - //判单预约人是否有微信openId - if (!string.IsNullOrEmpty(userdata.FirstOrDefault()?.wechatId)) - //发送晨成功订阅号消息 - _wechatMessagerClient.wxts(userdata.FirstOrDefault()?.wechatId, Lawyerboldata?.operatorName, unitname, Lawyerboldata?.receptiontime, Lawyerboldata?.objectstr + "-" + Lawyerboldata?.matter, Lawyerboldata?.reason); - } - else - { - //判单预约人是否有微信openId - if (!string.IsNullOrEmpty(userdata.FirstOrDefault()?.wechatId)) - //发送拒绝订阅号消息 - _wechatMessagerClient.sbwxts(userdata.FirstOrDefault()?.wechatId, Lawyerboldata?.operatorName, unitname, Lawyerboldata?.receptiontime, Lawyerboldata?.matter, Lawyerboldata?.reason); - } + { + //判单预约人是否有微信openId + if (!string.IsNullOrEmpty(userdata.FirstOrDefault()?.wechatId)) + //发送晨成功订阅号消息 + _wechatMessagerClient.wxts(userdata.FirstOrDefault()?.wechatId, Lawyerboldata?.operatorName, unitname, Lawyerboldata?.receptiontime, Lawyerboldata?.objectstr + "-" + Lawyerboldata?.matter, Lawyerboldata?.reason); + } + else + { + //判单预约人是否有微信openId + if (!string.IsNullOrEmpty(userdata.FirstOrDefault()?.wechatId)) + //发送拒绝订阅号消息 + _wechatMessagerClient.sbwxts(userdata.FirstOrDefault()?.wechatId, Lawyerboldata?.operatorName, unitname, Lawyerboldata?.receptiontime, Lawyerboldata?.matter, Lawyerboldata?.reason); + } result.IsSucceed = true; result.result = "同意"; }