|
@@ -2081,7 +2081,9 @@ public class OrderController : BaseController
|
|
|
|
|
|
var dto = _mapper.Map<OrderDto>(order!);
|
|
var dto = _mapper.Map<OrderDto>(order!);
|
|
dto.CanEndCountersign = canEndCs;
|
|
dto.CanEndCountersign = canEndCs;
|
|
-
|
|
|
|
|
|
+ dto.IsCanDelay = !order.OrderDelays.Any(x => x.DelayState == EDelayState.Examining);
|
|
|
|
+ var delayModel = order.OrderDelays.Where(x=>x.DelayState == EDelayState.Pass).OrderByDescending(x => x.CreationTime).FirstOrDefault();
|
|
|
|
+ dto.DelayString = delayModel!=null ? delayModel?.DelayNum + "个" + delayModel?.DelayUnit.GetDescription() :"";
|
|
if (dto.FileJson != null && dto.FileJson.Any())
|
|
if (dto.FileJson != null && dto.FileJson.Any())
|
|
{
|
|
{
|
|
var ids = order.FileJson.Select(x => x.Id).ToList();
|
|
var ids = order.FileJson.Select(x => x.Id).ToList();
|