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