合并

src/Hotline.Api/Controllers/OrderController.cs

@@ -3107,8 +3107,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>
@@ -5255,8 +5260,8 @@ public class OrderController : BaseController
             SpecialReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.SpecialReason),
             InstaShotSpecialReason = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.InstaShotSpecialReason),
             Step = step,
-            IsTerminate = _orderTerminateRepository.Queryable().Where(d => d.OrderId == order.Id && d.Status == ETerminateStatus.End).AnyAsync(),
-            BaseTypeId = baseTypeId
+			IsTerminate = await _orderTerminateRepository.Queryable().Where(d=>d.OrderId == order.Id && d.Status == ETerminateStatus.End).AnyAsync(),
+			BaseTypeId = baseTypeId
         };
         return rsp;
     }
@@ -5282,8 +5287,8 @@ public class OrderController : BaseController
             SpecialTimeType = EnumExts.GetDescriptions<ETimeType>(),
             SpecialReason = isInstaShot ? _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.InstaShotSpecialReason) : _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.SpecialReason),
             ReTransactErrorType = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.ReTransactErrorType),
-            IsTerminate = _orderTerminateRepository.Queryable().Where(d => d.OrderId == order.Id && d.Status == ETerminateStatus.End).AnyAsync(),
-            Step = step,
+            IsTerminate = await _orderTerminateRepository.Queryable().Where(d => d.OrderId == order.Id && d.Status == ETerminateStatus.End).AnyAsync(),
+			Step = step,
             Orgs = orgs,
         };
         return rsp;

src/Hotline.Api/Controllers/OrderTerminateController.cs

@@ -265,7 +265,7 @@ namespace Hotline.Api.Controllers
 			var rspModel = _mapper.Map<OrderTerminateEntityDto>(model);
 			rspModel.IsCanHandle = model.Workflow?.IsCanHandle(
 				_sessionContext.RequiredUserId, _sessionContext.RequiredOrgId, _sessionContext.Roles) ?? false;
-			if (model.Status ==  ETerminateStatus.SendBack)
+			if (model.Status ==  ETerminateStatus.SendBackStart)
 				rspModel.IsCanHandle = false;
 			rspModel.Handle = false;
 			if (!string.IsNullOrEmpty(rspModel.WorkflowId))

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

src/Hotline/File/File.cs

@@ -7,6 +7,12 @@ namespace Hotline.File
 	[Description("附件")]
 	public class File : FullStateEntity
 	{
+		/// <summary>
+		/// 附件全称
+		/// </summary>
+		[SugarColumn(ColumnDescription = "附件全称")]
+		public string? FileName { get; set; }
+
 		/// <summary>
 		/// 附件名称
 		/// </summary>