Merge branch 'develop' of http://18t7i08736.yicp.fun:10018/Coder/24Hour.Service into develop

24Hour/Controllers/Common/CommonController.cs

@@ -1151,7 +1151,7 @@ namespace _24Hour.Controllers.Common
                 //获取律师服务预约记录
                 var Lawyerdata = await _db.Queryable<App_LawyerServicesModel>()
                     //.WhereIF(!string.IsNullOrEmpty(_userdata.department), x => /*x.receptionuser == _userdata.department &&*/ (x.operatorId == _userdata.Id || x.operatorId == null))
-                    .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser) && q.state != 2 && q.state != 3 && q.unitCode == _userdata.unitCode).ToArrayAsync();
+                    .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser) && q.state != 2 && q.state != 3 && q.state != 4 && q.unitCode == _userdata.unitCode).ToArrayAsync();
                 //    .Where(q => q.IsDeleted == 0 && q.receptionuser == _userdata.department && q.state != 2 && q.state != 3).ToArrayAsync();
                 Lawyerdata.ToList().ForEach(q =>
                 {
@@ -1488,6 +1488,12 @@ namespace _24Hour.Controllers.Common
                     var Lawyerboldata = Lawyerbol.FirstOrDefault();
                     if (dto.Type == 1)
                     {
+                        if (Lawyerboldata.state ==4)
+                        {
+                            result.IsSucceed = false;
+                            result.result = "预约已被取消";
+                            return result;
+                        }
                         if (Lawyerboldata.operatorId != null)
                         {
                             result.IsSucceed = false;

24Hour/Controllers/Common/LawyerservicesController.cs

@@ -257,6 +257,42 @@ namespace _24Hour.Controllers.Common
             _logs.WriteSysLogadd("律师服务", "删除律师服务预约", result, _db);
             return result;
         }
+
+        /// <summary>
+        /// 取消律师服务预约
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("GetCancellationLawyer")]
+        public async Task<Result> GetCancellationLawyer(CurrencyDelete Currency)
+        {
+            try
+            {
+                _db.BeginTran();
+                var Deletelist = await _db.Queryable<App_LawyerServicesModel>().In(q => q.Id, Currency.id).ToListAsync();
+                Deletelist.ForEach(q =>
+                {
+                    q.state = 4;
+                });
+                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;
+                LogService.WriteLog(ex, "取消律师阅卷");
+            }
+            _logs.WriteSysLogadd("律师服务", "取消律师服务预约", result, _db);
+            return result;
+        }
         #endregion
 
 
@@ -279,6 +315,13 @@ namespace _24Hour.Controllers.Common
             {
                 var Lawyerbol = await _db.Queryable<App_LawyerServicesModel>().Where(q => q.Id == Id).ToListAsync();
                 if (Lawyerbol.Count() > 0)
+                {
+                    if (Lawyerbol.FirstOrDefault().state == 4)
+                    {
+                        result.IsSucceed = false;
+                        result.result = "预约已被取消";
+                    }
+                    else
                     {
                         Lawyerbol.FirstOrDefault().receptionuser = transactors;
                         _db.BeginTran();
@@ -290,6 +333,7 @@ namespace _24Hour.Controllers.Common
                             result.result = "修改成功";
                         }
                     }
+                }
                 else
                 {
                     result.IsSucceed = false;
@@ -327,8 +371,11 @@ namespace _24Hour.Controllers.Common
                     var Lawyerboldata = Lawyerbol.FirstOrDefault();
                     if (Lawyerboldata.state != 0)
                     {
-                        result.IsSucceed = false;
+                        if (Lawyerboldata.state==4)
+                            result.result = "预约已被取消！";
+                        else
                             result.result = "数据已被其他人接收处理！";
+                        result.IsSucceed = false;
                         return result;
                     }
                     Lawyerboldata.receptiontime = starttime;