From 3583107d6aa4c2da0a27950f0596ab6aab91f8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=BD=87=E9=98=B3?= Date: Wed, 8 Nov 2023 10:20:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common/LawyerArchivesController.cs | 117 +++--------------- 1 file changed, 20 insertions(+), 97 deletions(-) diff --git a/24Hour/Controllers/Common/LawyerArchivesController.cs b/24Hour/Controllers/Common/LawyerArchivesController.cs index ec156da..21979ca 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 && x.isdeactivate==0) + .Where(x => x.unitCode == _userdata.unitCode && x.IsDeleted == 0 && x.isdeactivate == 0) .Where(x => x.identity == "律师") .ToListAsync(); res.IsSucceed = true; @@ -71,41 +71,6 @@ namespace _24Hour.Controllers.Common return res; } - ///// - ///// 禁用/启用律师 - ///// - ///// - ///// - //[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; - - // 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; - //} - /// /// 修改内网律师信息 /// @@ -120,15 +85,11 @@ namespace _24Hour.Controllers.Common var data = await _db.Queryable().FirstAsync(x => x.Id == input.Id); if (data != null) { - data.cardId = input.cardId; - data.phone = input.phone; - data.name = input.name; - data.departmentName = input.departmentName; - data.identitycardId = input.identitycardId; - //update + data = mapper.Map(input, data); _db.BeginTran(); var num = await _db.Updateable(data).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); _db.CommitTran(); + if (num > 0) { result.IsSucceed = true; @@ -234,7 +195,7 @@ namespace _24Hour.Controllers.Common .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) + .OrderByDescending(x => x.createTime) .ToPageListAsync(input.PageIndex, input.PageSize, totalNumber); input.RowsCount = totalNumber; var data = new QueryResult(input, list.OrderByDescending(q => q.createTime).ToList()); @@ -254,7 +215,6 @@ namespace _24Hour.Controllers.Common try { var entity = mapper.Map(dto); - entity.Id = Guid.NewGuid().ToString(); entity.createrId = _userdata.Id; entity.createTime = DateTime.Now; @@ -679,66 +639,29 @@ namespace _24Hour.Controllers.Common { try { - var start = DateTime.Now.AddDays(-7).Date; - var end = DateTime.Now.Date; + int dayscount = 7; + var days = Enumerable.Range(0, dayscount).Select(x => DateTime.Now.AddDays(-x).Date).ToList(); var registerCount = await _db.Queryable() - .Where(x => x.createTime.Value.Date >= start && x.createTime.Value.Date <= end) + .Where(x => x.createTime.Value.Date >= days[dayscount - 1] && x.createTime.Value.Date <= days[0]) .Where(x => x.unitcode == _userdata.unitCode) .Where(x => x.IsDeleted == 0) .ToListAsync(); - var a = DateTime.Now.Date; - var b = DateTime.Now.AddDays(-1).Date; - var c = DateTime.Now.AddDays(-2).Date; - var d = DateTime.Now.AddDays(-3).Date; - var e = DateTime.Now.AddDays(-4).Date; - var f = DateTime.Now.AddDays(-5).Date; - var g = DateTime.Now.AddDays(-6).Date; - - var da = registerCount.Count(x => x.createTime.Value.Date == a); - var db = registerCount.Count(x => x.createTime.Value.Date == b); - var dc = registerCount.Count(x => x.createTime.Value.Date == c); - var dd = registerCount.Count(x => x.createTime.Value.Date == d); - var de = registerCount.Count(x => x.createTime.Value.Date == e); - var df = registerCount.Count(x => x.createTime.Value.Date == f); - var dg = registerCount.Count(x => x.createTime.Value.Date == g); - - result.result = new[] + var data = registerCount + .GroupBy(x => x.createTime.Value.Date) + .ToDictionary(x => x.Key, x => x.Count()); + foreach (var item in days) { - new - { - date=g.ToShortDateString(), - count=dg - }, - new - { - date=f.ToShortDateString(), - count=df - }, - new + if (data.ContainsKey(item) == false) { - date=e.ToShortDateString(), - count=de - }, - new - { - date=d.ToShortDateString(), - count=dd - }, - new - { - date=c.ToShortDateString(), - count=dc - }, - new - { - date=b.ToShortDateString(), - count=db - },new - { - date=a.ToShortDateString(), - count=da + data.Add(item, 0); } - }; + } + var res = data.OrderBy(x => x.Key).Select(x => new + { + date = x.Key.ToShortDateString(), + count = x.Value + }).ToList(); + result.result = res; result.IsSucceed = true; } catch