|
@@ -4337,15 +4337,16 @@ public class OrderController : BaseController
|
|
|
List<OrderRemarksDto> remarks = workflow.Steps.Where(x => !string.IsNullOrEmpty(x.Remark)).Select(x => new OrderRemarksDto
|
|
|
{ Remark = x.Remark, RemarkTime = x.HandleTime, RemarkUser = x.HandlerName }).ToList();
|
|
|
dto.OrderRemarks = remarks;
|
|
|
+ //退回
|
|
|
if (order.Status == EOrderStatus.SendBack || order.Status == EOrderStatus.BackToUnAccept)
|
|
|
{
|
|
|
var backTrace = workflow.Traces.Where(x => x.Status == EWorkflowStepStatus.Handled).OrderByDescending(x => x.CreationTime).First();
|
|
|
- backTrace.Opinion = backTrace.Opinion.Replace("流程归档", "");
|
|
|
+ // backTrace.Opinion = backTrace.Opinion.Replace("流程归档", "");
|
|
|
dto.SendBackOpinion = string.IsNullOrEmpty(backTrace.Opinion) ? string.Empty : "【" + backTrace.HandlerOrgName + "】" + backTrace.Opinion;
|
|
|
//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();
|