tangjiang 4 ヶ月 前
コミット
a4b9d8ec5b

+ 13 - 4
src/Hotline.Api/Controllers/OrderController.cs

@@ -3357,10 +3357,10 @@ public class OrderController : BaseController
         var delayModel = order.OrderDelays.MaxBy(x => x.CreationTime);
         if (delayModel != null)
         {
-            //if (delayModel.IsProDelay)
-            //{
-            //    dto.ProvinceDelayString = "该工单已向省平台发送延期申请!延期状态:";
-            //}
+            if (delayModel.IsProDelay)
+            {
+                dto.ProvinceDelayString = "该工单已向省平台发送延期申请!延期状态:" + delayModel.DelayState.GetDescription();
+            }
             var workFlow = await _workflowRepository.GetAsync(delayModel.WorkflowId);
             switch (delayModel.DelayState)
             {
@@ -3383,6 +3383,7 @@ public class OrderController : BaseController
         else
         {
             dto.DelayString = "";
+            dto.ProvinceDelayString = "";
         }
 
         //dto.CanPrevious = canPrevious;
@@ -3491,6 +3492,14 @@ public class OrderController : BaseController
             dto.ProvinceRevokeString = "该工单已由省平台发送撤单!请直接归档办理!";
         }
 
+        //省甄别
+        var orderScreen = await _orderScreenRepository.Queryable().Where(x => x.OrderId == order.Id && x.IsProScreen == true).OrderByDescending(x => x.CreationTime)
+                 .FirstAsync();
+        if (orderScreen != null)
+        {
+            dto.ProvinceScreenString = "该工单已向省平台发送甄别申请!甄别状态:" + orderScreen.Status.GetDescription();
+        }
+
         //终止
         var orderTerminateList = await _orderTerminateRepository.Queryable().Where(x => x.OrderId == order.Id).ToListAsync();
         dto.OrderTerminateStatus = orderTerminateList.Any(x => x.Status == ETerminateStatus.End) ? "同意" :

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

@@ -531,11 +531,6 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string? DelayString { get; set; }
 
-        /// <summary>
-        /// 省延期
-        /// </summary>
-        public string? ProvinceDelayString { get; set; }
-
         /// <summary>
         /// 是否可退回
         /// </summary>
@@ -912,6 +907,16 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string ProvinceRevokeString { get; set; }
 
+        /// <summary>
+        /// 省甄别
+        /// </summary>
+        public string ProvinceScreenString { get; set; }
+
+        /// <summary>
+        /// 省延期
+        /// </summary>
+        public string? ProvinceDelayString { get; set; }
+
         /// <summary>
         /// 省工单退回
         /// </summary>