优化代码

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -63,7 +63,7 @@ namespace _24Hour.Controllers.Common
             var res = new Result<IEnumerable<App_Sys_UserModel>>();
 
             var data = await _db.Queryable<App_Sys_UserModel>()
-                .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;
         }
 
-        ///// <summary>
-        ///// 禁用/启用律师
-        ///// </summary>
-        ///// <param name="input"></param>
-        ///// <returns></returns>
-        //[HttpGet]
-        //[Route("DisableLawyer")]
-        //public async Task<Result> DisableLawyer(string id,int status)
-        //{
-        //    try
-        //    {
-        //        _db.BeginTran();
-        //        var Deletelist = await _db.Queryable<App_Sys_UserModel>().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;
-        //}
-
         /// <summary>
         /// 修改内网律师信息
         /// </summary>
@@ -120,15 +85,11 @@ namespace _24Hour.Controllers.Common
                 var data = await _db.Queryable<App_Sys_UserModel>().FirstAsync(x => x.Id == input.Id);
                 if (data != null)
                 {
-                    data.cardId = input.cardId;
+                    data = mapper.Map(input, data);
-                    data.phone = input.phone;
-                    data.name = input.name;
-                    data.departmentName = input.departmentName;
-                    data.identitycardId = input.identitycardId;
-                    //update
                     _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<LawyerArchives>(input, list.OrderByDescending(q => q.createTime).ToList());
@@ -254,7 +215,6 @@ namespace _24Hour.Controllers.Common
             try
             {
                 var entity = mapper.Map<LawyerArchives>(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;
+                int dayscount = 7;
-                var end = DateTime.Now.Date;
+                var days = Enumerable.Range(0, dayscount).Select(x => DateTime.Now.AddDays(-x).Date).ToList();
                 var registerCount = await _db.Queryable<LawyerArchives>()
-                    .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 data = registerCount
-                var b = DateTime.Now.AddDays(-1).Date;
+                    .GroupBy(x => x.createTime.Value.Date)
-                var c = DateTime.Now.AddDays(-2).Date;
+                    .ToDictionary(x => x.Key, x => x.Count());
-                var d = DateTime.Now.AddDays(-3).Date;
+                foreach (var item in days)
-                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[]
-                {
-                    new
                 {
-                        date=g.ToShortDateString(),
+                    if (data.ContainsKey(item) == false)
-                        count=dg
-                    },
-                    new
                     {
-                        date=f.ToShortDateString(),
+                        data.Add(item, 0);
-                        count=df
-                    },
-                    new
-                    {
-                        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
                     }
-                };
+                }
+                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