|
@@ -71,6 +71,7 @@ using Microsoft.AspNetCore.Mvc;
|
|
|
using Microsoft.Extensions.Options;
|
|
|
using MiniExcelLibs;
|
|
|
using SqlSugar;
|
|
|
+using System.Diagnostics;
|
|
|
using System.Text;
|
|
|
using System.Text.Json;
|
|
|
using System.Threading;
|
|
@@ -4344,6 +4345,12 @@ public class OrderController : BaseController
|
|
|
//var sendBack = await _orderSendBackAuditRepository.Queryable().Where(x => x.OrderId == dto.Id).OrderByDescending(x => x.CreationTime).FirstAsync();
|
|
|
//dto.SendBackOpinion = sendBack is { Id: not null } && !string.IsNullOrEmpty(sendBack.Content) ? sendBack.Content : string.Empty;
|
|
|
}
|
|
|
+
|
|
|
+ if (order.Status == EOrderStatus.Special|| order.Status == EOrderStatus.SpecialToUnAccept)
|
|
|
+ {
|
|
|
+ var reTransactTrace = workflow.Traces.Where(x => x.Status == EWorkflowStepStatus.Handled).OrderByDescending(x => x.CreationTime).First();
|
|
|
+ dto.ReTransactOpinion = string.IsNullOrEmpty(reTransactTrace.Opinion) ? string.Empty : reTransactTrace.HandlerOrgName + " " + reTransactTrace.Opinion;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//工单是否在退回审批中
|