소스 검색

终止状态

田爽 6 달 전
부모
커밋
940937612f
2개의 변경된 파일11개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 1
      src/Hotline.Api/Controllers/OrderController.cs
  2. 5 0
      src/Hotline.Share/Dtos/Order/OrderDto.cs

+ 6 - 1
src/Hotline.Api/Controllers/OrderController.cs

@@ -3104,8 +3104,13 @@ public class OrderController : BaseController
         {
             dto.ProvinceRevokeString = "该工单已由省平台发送撤单!请直接归档办理!";
         }
+        //终止
+        var orderTerminateList = await _orderTerminateRepository.Queryable().Where(x => x.OrderId == order.Id).ToListAsync();
+        dto.OrderTerminateStatus = orderTerminateList.Any(x => x.Status == ETerminateStatus.End) ? "同意" ? orderTerminateList.Any(x => x.Status == ETerminateStatus.Refuse) ?
+            "不同意" : orderTerminateList.Any(x => x.Status == ETerminateStatus.Approval || x.Status == ETerminateStatus.SendBack) ? "审批中" : null;
 
-        return _sessionContext.OrgIsCenter ? dto : dto.DataMask();
+
+		return _sessionContext.OrgIsCenter ? dto : dto.DataMask();
     }
 
     /// <summary>

+ 5 - 0
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -750,6 +750,11 @@ namespace Hotline.Share.Dtos.Order
 		/// </summary>
 		public List<OrderTerminateDto> OrderTerminates { get; set; }
 
+        /// <summary>
+        /// 终止状态
+        /// </summary>
+        public string OrderTerminateStatus { get; set; }
+
 	}
 
     public class UpdateOrderDto : AddOrderDto