给一体机新增两个接口

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -34,19 +34,19 @@ namespace _24Hour.Controllers.Common
         private readonly SqlSugarClient _db;//数据库
         private readonly WriteSysLog _logs;//操作日志
         App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户
-        private readonly ILogger<LoginController> _logger;//日志
+        private readonly ILogger<LawyerArchivesController> logger;//日志
         Result result = new Result();
         private readonly CaseServiceTwentyClient twentyClient;
 
         private readonly IMapper mapper;
-        public LawyerArchivesController(ILogger<LoginController> logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper,CaseServiceTwentyClient _twentyClient)
+        public LawyerArchivesController(ILogger<LawyerArchivesController> _logger, SqlSugarClient db, WriteSysLog logs, User user, IMapper _mapper, CaseServiceTwentyClient _twentyClient)
         {
-            this._logger = logger;
+            this.logger = _logger;
             _db = db;
             _logs = logs;
-            _userdata = user.Userdata();
             this.mapper = _mapper;
             this.twentyClient = _twentyClient;
+            _userdata = user.Userdata();
         }
         #endregion
         #region 律师阅卷
@@ -106,14 +106,13 @@ namespace _24Hour.Controllers.Common
         /// <returns></returns>
         [HttpGet]
         [Route("QueryLawyerArchives")]
-        public async Task<Result> QueryLawyerArchives(LawyerArchivesInput input)
+        public async Task<Result> QueryLawyerArchives([FromQuery] LawyerArchivesInput input)
         {
             RefAsync<int> totalNumber = 0;//总数据
             //查询律师服务
             var list = await _db.Queryable<LawyerArchives>().LeftJoin<App_LawyerServicesModel>((archives, services) => archives.lawyerservicesId == services.Id)
                 .WhereIF(input.bmsah != null, (archives, services) => archives.bmsah == input.bmsah)
                 .WhereIF(input.lawyerId != null, (archives, services) => archives.lawyerId == input.lawyerId)
-                .WhereIF(input.lawyerservicesId != null, (archives, services) => archives.lawyerservicesId == input.lawyerservicesId)
                 .WhereIF(input.Id != null, (archives, services) => archives.Id == input.Id)
                 .WhereIF(input.unitCode != null, (archives, services) => services.unitCode == input.unitCode)
                 .WhereIF(input.receptionuserId != null, (archives, services) => services.receptionuser == input.receptionuserId)
@@ -325,15 +324,63 @@ namespace _24Hour.Controllers.Common
                 var insert = await AddArchivesInfo(dto);
                 result.result = insert.result.Id;
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
                 result.IsSucceed = false;
                 result.Message = ex.Message;
             }
             return result;
         }
+        /// <summary>
+        /// 一体机 根据卷宗id获取详细的卷宗信息
+        /// </summary>
+        /// <param name="jzid"></param>
+        /// <returns></returns>
+        [HttpGet("QueryArchiveById")]
+        public async Task<Result> QueryArchiveById(string jzid)
+        {
+            try
+            {
+                var list = await _db.Queryable<JZJBXX>()
+                    .Includes(x => x.jzml, q => q.jzwj)
+                    .FirstAsync(x => x.Id == jzid);
 
+                var data = mapper.Map<JZJBXXDto>(list);
+                result.result = data;
+                result.IsSucceed = true;
+            }
+            catch (Exception ex)
+            {
 
+            }
+            return result;
+        }
+        /// <summary>
+        /// 一体机查询当前用户已有的 被同意的 预约阅卷信息
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("QueryReservedInfo")]
+        public async Task<Result> QueryReservedInfo()
+        {
+            try
+            {
+                logger.LogInformation("12312312312");
+                var list = await _db.Queryable<LawyerArchives>()
+                  .Where(x => x.lawyerId == _userdata.Id)
+                  .Where(x => x.status == 0)
+                  .Where(x => x.permissibleStartTime <= DateTime.Now && x.permissibleEndTime >= DateTime.Now)
+                  .ToListAsync();
+
+                var data = mapper.Map<IEnumerable<LawyerArchivesDto>>(list);
+                result.result = data;
+                result.IsSucceed = true;
+            }
+            catch (Exception ex)
+            {
+
+            }
+            return result;
+        }
 
         #endregion
         #region HiddenApi