tangjiang 4 週間 前
コミット
d42f316346

+ 7 - 0
src/Hotline.Api/Controllers/OrderController.cs

@@ -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;
+            }
         }
 
         //工单是否在退回审批中

+ 5 - 0
src/Hotline.Share/Dtos/Order/OrderDto.cs

@@ -941,6 +941,11 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string SendBackOpinion { get; set; }
 
+        /// <summary>
+        /// 重办意见
+        /// </summary>
+        public string? ReTransactOpinion { get; set; }
+
         /// <summary>
         /// 退回原因
         /// </summary>