瀏覽代碼

Merge branch 'release' of http://110.188.24.182:10023/Fengwo/hotline into release

xf 6 月之前
父節點
當前提交
e0694aaa52
共有 2 個文件被更改,包括 1 次插入13 次删除
  1. 0 7
      src/Hotline.Api/Controllers/OrderController.cs
  2. 1 6
      src/Hotline.Share/Dtos/Order/OrderDto.cs

+ 0 - 7
src/Hotline.Api/Controllers/OrderController.cs

@@ -3022,13 +3022,6 @@ public class OrderController : BaseController
         {
             dto.ProvinceRevokeString = "该工单已由省平台发送撤单!请直接归档办理!";
         }
-        var isHasSendBackAudit = await _orderSendBackAuditRepository.Queryable().AnyAsync(x => x.OrderId == order.Id && x.State == ESendBackAuditState.Apply);
-        var isHasSendBack = await _orderSendBackRepository.Queryable().AnyAsync(x => x.OrderId == order.Id && x.State == 0);
-        if ((order.ActualHandleOrgCode == "001" || order.Status == EOrderStatus.WaitForAccept || string.IsNullOrEmpty(order.ActualHandleOrgCode)) && !isHasSendBackAudit && order.Status < EOrderStatus.Filed && order.IsProvince && !isHasSendBack && order.Status != EOrderStatus.BackToProvince)
-            dto.IsCanProvinceSendBack = true;
-        else
-            dto.IsCanProvinceSendBack = false;
-
         return dto;
     }
 

+ 1 - 6
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -695,12 +695,7 @@ namespace Hotline.Share.Dtos.Order
         /// 省撤单信息
         /// </summary>
         public string ProvinceRevokeString { get; set; }
-
-
-        /// <summary>
-        /// 是否可以省退回
-        /// </summary>
-        public bool IsCanProvinceSendBack { get; set; }
+      
     }
 
     public class UpdateOrderDto : AddOrderDto