|
@@ -3104,8 +3104,13 @@ public class OrderController : BaseController
|
|
{
|
|
{
|
|
dto.ProvinceRevokeString = "该工单已由省平台发送撤单!请直接归档办理!";
|
|
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>
|
|
/// <summary>
|