|
|
@@ -4409,9 +4409,9 @@ public class OrderController : BaseController
|
|
|
: EProcessType.Jiaoban;
|
|
|
if (expiredTime.ExpiredTime < order.ExpiredTime)
|
|
|
{
|
|
|
- expiredTime.ExpiredTime = order.ExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTime = order.NearlyExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne;
|
|
|
+ expiredTime.ExpiredTime = order.ExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTime = order.NearlyExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne.Value;
|
|
|
}
|
|
|
//var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now,
|
|
|
// ETimeType.WorkDay,
|
|
|
@@ -4534,11 +4534,11 @@ public class OrderController : BaseController
|
|
|
var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now,
|
|
|
ETimeType.WorkDay,
|
|
|
dto.TimeLimit.Value, order.AcceptTypeCode);
|
|
|
- if (expiredTime.ExpiredTime < order.ExpiredTime)
|
|
|
+ if (expiredTime.EndTime < order.ExpiredTime.Value)
|
|
|
{
|
|
|
- expiredTime.ExpiredTime = order.ExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTime = order.NearlyExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne;
|
|
|
+ expiredTime.EndTime = order.ExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTime = order.NearlyExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne.Value;
|
|
|
}
|
|
|
endTime = expiredTime.EndTime;
|
|
|
await _orderRepository.Updateable().SetColumns(o => new Orders.Order() { ExpiredTime = expiredTime.EndTime, NearlyExpiredTime = expiredTime.NearlyExpiredTime, NearlyExpiredTimeOne = expiredTime.NearlyExpiredTimeOne })
|
|
|
@@ -4630,9 +4630,9 @@ public class OrderController : BaseController
|
|
|
var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
|
if (expiredTime.ExpiredTime < order.ExpiredTime)
|
|
|
{
|
|
|
- expiredTime.ExpiredTime = order.ExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTime = order.NearlyExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne;
|
|
|
+ expiredTime.ExpiredTime = order.ExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTime = order.NearlyExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne.Value;
|
|
|
}
|
|
|
//var processType = dto.FlowDirection == EFlowDirection.OrgToCenter || dto.FlowDirection == EFlowDirection.CenterToCenter ? EProcessType.Zhiban : EProcessType.Jiaoban;
|
|
|
var processType = special.FlowDirection is EFlowDirection.OrgToCenter or EFlowDirection.CenterToCenter or EFlowDirection.FiledToCenter
|
|
|
@@ -4745,9 +4745,9 @@ public class OrderController : BaseController
|
|
|
var expiredTime = _timeLimitDomainService.CalcEndTime(DateTime.Now, order.AcceptTypeCode);
|
|
|
if (expiredTime.ExpiredTime < order.ExpiredTime)
|
|
|
{
|
|
|
- expiredTime.ExpiredTime = order.ExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTime = order.NearlyExpiredTime;
|
|
|
- expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne;
|
|
|
+ expiredTime.ExpiredTime = order.ExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTime = order.NearlyExpiredTime.Value;
|
|
|
+ expiredTime.NearlyExpiredTimeOne = order.NearlyExpiredTimeOne.Value;
|
|
|
}
|
|
|
//var processType = dto.FlowDirection == EFlowDirection.OrgToCenter || dto.FlowDirection == EFlowDirection.CenterToCenter ? EProcessType.Zhiban : EProcessType.Jiaoban;
|
|
|
var processType = special.FlowDirection is EFlowDirection.OrgToCenter or EFlowDirection.CenterToCenter or EFlowDirection.FiledToCenter
|
