接口调整

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)
+                .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;
         }
 
-        /// <summary>
+        ///// <summary>
-        /// 删除律师
+        ///// 禁用/启用律师
-        /// </summary>
+        ///// </summary>
-        /// <param name="input"></param>
+        ///// <param name="input"></param>
-        /// <returns></returns>
+        ///// <returns></returns>
-        [HttpPost]
+        //[HttpGet]
-        [Route("RemoveLawyer")]
+        //[Route("DisableLawyer")]
-        public async Task<Result> RemoveLawyer(CurrencyDelete Currency)
+        //public async Task<Result> DisableLawyer(string id,int status)
-        {
+        //{
-            try
+        //    try
-            {
+        //    {
-                _db.BeginTran();
+        //        _db.BeginTran();
-                var Deletelist = await _db.Queryable<App_Sys_UserModel>().In(q => q.Id, Currency.id).ToListAsync();
+        //        var Deletelist = await _db.Queryable<App_Sys_UserModel>().FirstAsync(x=>x.Id==id);
-                Deletelist.ForEach(q =>
+        //        Deletelist.isdeactivate = status;
-                {
-                    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, "");
 
-            }
+        //        var num = await _db.Updateable(Deletelist).ExecuteCommandAsync();
-            _logs.WriteSysLogadd("律师阅卷服务", "删除律师信息", result, _db);
+        //        _db.CommitTran();
-            return result;
+        //        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>
         /// 修改内网律师信息
@@ -162,7 +160,7 @@ namespace _24Hour.Controllers.Common
         {
             try
             {
-                var data = await _db.Queryable<App_Sys_UserModel>().FirstAsync(x => x.cardId == input.cardId);
+                var data = await _db.Queryable<App_Sys_UserModel>().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<LawyerArchives>(input, list.OrderByDescending(q => q.createTime).ToList());
@@ -571,6 +570,32 @@ namespace _24Hour.Controllers.Common
             }
             return result;
         }
+        /// <summary>
+        /// 统计律师名下的预约信息
+        /// </summary>
+        /// <param name="lawyerId"></param>
+        /// <returns></returns>
+        [HttpGet("QueryLawyerReservedInfo")]
+        public async Task<Result> QueryLawyerReservedInfo(string? lawyerId)
+        {
+            try
+            {
+                var list = await _db.Queryable<LawyerArchives>()
+                  .Where(x => x.lawyerId == lawyerId)
+                  .Where(x => x.status == 0 || x.status == 1)
+                  .Where(x => x.IsDeleted == 0)
+                  .ToListAsync();
+
+                var data = mapper.Map<IEnumerable<LawyerArchivesDto>>(list);
+                result.result = data;
+                result.IsSucceed = true;
+            }
+            catch (Exception ex)
+            {
+                logger.LogError(ex, "QueryReservedInfo");
+            }
+            return result;
+        }
         #endregion
         #region HiddenApi
         /// <summary>
@@ -732,21 +757,21 @@ namespace _24Hour.Controllers.Common
         {
             try
             {
-               // var allcount = await _db.Queryable<LawyerArchives>().CountAsync();
+                // var allcount = await _db.Queryable<LawyerArchives>().CountAsync();
                 var registerCount = await _db.Queryable<LawyerArchives>()
-                    .LeftJoin<App_Sys_UserModel>((it,user)=>it.lawyerId==user.Id)
+                    .LeftJoin<App_Sys_UserModel>((it, user) => it.lawyerId == user.Id)
-                       .GroupBy((it,user) => new { it.lawyerId }).Select((it,user) => new
+                       .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
+                           //  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<JZJBXX>().CountAsync();
+                // var allcount = await _db.Queryable<JZJBXX>().CountAsync();
                 var registerCount = await _db.Queryable<JZJBXX>()
                        .GroupBy(it => new { it.ajlbmc }).Select(it => new
                        {