From 7bed988addfecfa904f6b00111f4de85e14a97c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=87=E9=98=B3=20=E9=82=B9?= Date: Fri, 3 Nov 2023 09:30:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 115 +++++++++++------- 1 file changed, 70 insertions(+), 45 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index 80e9e29..ec156da 100644 --- a/24Hour/Controllers/Common/LawyerArchivesController.cs +++ b/24Hour/Controllers/Common/LawyerArchivesController.cs @@ -63,7 +63,7 @@ namespace _24Hour.Controllers.Common var res = new Result>(); var data = await _db.Queryable() - .Where(x => x.unitCode == _userdata.unitCode && x.IsDeleted == 0) + .Where(x => x.unitCode == _userdata.unitCode && x.IsDeleted == 0 && x.isdeactivate==0) .Where(x => x.identity == "律师") .ToListAsync(); res.IsSucceed = true; @@ -71,42 +71,40 @@ namespace _24Hour.Controllers.Common return res; } - /// - /// 删除律师 - /// - /// - /// - [HttpPost] - [Route("RemoveLawyer")] - public async Task RemoveLawyer(CurrencyDelete Currency) - { - try - { - _db.BeginTran(); - var Deletelist = await _db.Queryable().In(q => q.Id, Currency.id).ToListAsync(); - Deletelist.ForEach(q => - { - q.IsDeleted = 1; - }); - var num = await _db.Updateable(Deletelist).ExecuteCommandAsync(); - _db.CommitTran(); - if (num > 0) - { - result.IsSucceed = true; - result.result = "删除成功"; - } - } - catch (System.Exception ex) - { - _db.RollbackTran(); - result.IsSucceed = false; - result.Message = ex.Message; - logger.LogError(ex, ""); + ///// + ///// 禁用/启用律师 + ///// + ///// + ///// + //[HttpGet] + //[Route("DisableLawyer")] + //public async Task DisableLawyer(string id,int status) + //{ + // try + // { + // _db.BeginTran(); + // var Deletelist = await _db.Queryable().FirstAsync(x=>x.Id==id); + // Deletelist.isdeactivate = status; - } - _logs.WriteSysLogadd("律师阅卷服务", "删除律师信息", result, _db); - return result; - } + // var num = await _db.Updateable(Deletelist).ExecuteCommandAsync(); + // _db.CommitTran(); + // if (num > 0) + // { + // result.IsSucceed = true; + // result.result = "删除成功"; + // } + // } + // catch (System.Exception ex) + // { + // _db.RollbackTran(); + // result.IsSucceed = false; + // result.Message = ex.Message; + // logger.LogError(ex, ""); + + // } + // _logs.WriteSysLogadd("律师阅卷服务", "删除律师信息", result, _db); + // return result; + //} /// /// 修改内网律师信息 @@ -162,7 +160,7 @@ namespace _24Hour.Controllers.Common { try { - var data = await _db.Queryable().FirstAsync(x => x.cardId == input.cardId); + var data = await _db.Queryable().FirstAsync(x => x.cardId == input.cardId && x.IsDeleted == 0); if (data != null) { result.IsSucceed = false; @@ -233,9 +231,10 @@ namespace _24Hour.Controllers.Common .WhereIF(string.IsNullOrEmpty(input.partyCardId) == false, x => x.partycardId == input.partyCardId) .WhereIF(string.IsNullOrEmpty(input.caseName) == false, x => x.casename.Contains(input.caseName)) .WhereIF(string.IsNullOrEmpty(input.bmsah) == false, x => x.bmsah.Contains(input.bmsah)) - .Where(x => x.permissibleStartTime > starttime && x.permissibleStartTime < endtime) + .Where(x => x.createTime.Value.Date >= starttime.Date && x.createTime.Value.Date <= endtime.Date) .Where(x => x.unitcode == input.unitCode) .WhereIF(input.Isdelete != null, x => x.IsDeleted == input.Isdelete) + .OrderByDescending(x=>x.createTime) .ToPageListAsync(input.PageIndex, input.PageSize, totalNumber); input.RowsCount = totalNumber; var data = new QueryResult(input, list.OrderByDescending(q => q.createTime).ToList()); @@ -571,6 +570,32 @@ namespace _24Hour.Controllers.Common } return result; } + /// + /// 统计律师名下的预约信息 + /// + /// + /// + [HttpGet("QueryLawyerReservedInfo")] + public async Task QueryLawyerReservedInfo(string? lawyerId) + { + try + { + var list = await _db.Queryable() + .Where(x => x.lawyerId == lawyerId) + .Where(x => x.status == 0 || x.status == 1) + .Where(x => x.IsDeleted == 0) + .ToListAsync(); + + var data = mapper.Map>(list); + result.result = data; + result.IsSucceed = true; + } + catch (Exception ex) + { + logger.LogError(ex, "QueryReservedInfo"); + } + return result; + } #endregion #region HiddenApi /// @@ -732,21 +757,21 @@ namespace _24Hour.Controllers.Common { try { - // var allcount = await _db.Queryable().CountAsync(); + // var allcount = await _db.Queryable().CountAsync(); var registerCount = await _db.Queryable() - .LeftJoin((it,user)=>it.lawyerId==user.Id) - .GroupBy((it,user) => new { it.lawyerId }).Select((it,user) => new + .LeftJoin((it, user) => it.lawyerId == user.Id) + .GroupBy((it, user) => new { it.lawyerId }).Select((it, user) => new { name = user.name, cardId = user.cardId, departmentName = user.departmentName, value = (double)SqlFunc.AggregateCount(it.lawyerId) - // count = (double)SqlFunc.AggregateCount(it.lawyerId) / (double)allcount - }).Take(10).ToListAsync(); + // count = (double)SqlFunc.AggregateCount(it.lawyerId) / (double)allcount + }).Take(10).ToListAsync(); result.result = registerCount; result.IsSucceed = true; } - catch(Exception ex) + catch (Exception ex) { result.IsSucceed = true; result.Message = "查询异常"; @@ -764,7 +789,7 @@ namespace _24Hour.Controllers.Common { try { - // var allcount = await _db.Queryable().CountAsync(); + // var allcount = await _db.Queryable().CountAsync(); var registerCount = await _db.Queryable() .GroupBy(it => new { it.ajlbmc }).Select(it => new {