Merge branch 'dev' of http://git.12345lm.cn/Fengwo/hotline into dev

src/Hotline.Api/Controllers/OrderController.cs

@@ -4062,8 +4062,12 @@ public class OrderController : BaseController
         model.StepCode = step.Code;
         model.State = 1;
         model.ESpecialType = ESpecialType.ReTransact;
-
-        model.InitId();
+        model.LastFileOpinion = order.FileOpinion;
+        model.FirstFileOpinion = order.FileOpinion;
+		var firstSpecial = await _orderSpecialRepository.Queryable().Where(x => x.OrderId == dto.OrderId).FirstAsync();
+        if (firstSpecial is not null)
+            model.FirstFileOpinion = firstSpecial.FirstFileOpinion;
+		model.InitId();
         if (dto.Files.Any())
             model.FileJson = await _fileRepository.AddFileAsync(dto.Files, model.Id, "", HttpContext.RequestAborted);
         await _orderSpecialRepository.AddAsync(model, HttpContext.RequestAborted);

src/Hotline.Application/Handlers/FlowEngine/WorkflowRecallHandler.cs

@@ -69,23 +69,24 @@ public class WorkflowRecallHandler : INotificationHandler<RecallNotify>
                     //    isRecallToSeatDesignated = false;
                     //var isRecallToSeatDesignated = bool.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.IsRecallToSeatDesignated).SettingValue[0]);
                     order.Status = EOrderStatus.SpecialToUnAccept;
-                    //if (isRecallToSeatDesignated)
-                    //{
-                    //    if (data.HandlerType is EHandlerType.Role or EHandlerType.AssignedUser)
-                    //    {
-                    //        var handler = data.NextHandlers.FirstOrDefault();
-                    //        if (handler != null)
-                    //        {
-                    //            order.SignerId = handler.Key;
-                    //            order.SignerName = handler.Value;
-                    //        }
-                    //    }
-                    //}
-                    //else
-                    //{
-                    //    //order.BackToUnsign();
-                    //}
-                }
+                    order.FileEmpty();
+					//if (isRecallToSeatDesignated)
+					//{
+					//    if (data.HandlerType is EHandlerType.Role or EHandlerType.AssignedUser)
+					//    {
+					//        var handler = data.NextHandlers.FirstOrDefault();
+					//        if (handler != null)
+					//        {
+					//            order.SignerId = handler.Key;
+					//            order.SignerName = handler.Value;
+					//        }
+					//    }
+					//}
+					//else
+					//{
+					//    //order.BackToUnsign();
+					//}
+				}
                 await _orderRepository.UpdateAsync(order, false, cancellationToken);
                 break;
             case WorkflowModuleConsts.KnowledgeAdd:

src/Hotline.Share/Dtos/Order/OrderSpecialDto.cs

@@ -225,6 +225,16 @@ namespace Hotline.Share.Dtos.Order
 
 		public string? OrgName { get; set; }
 
+		/// <summary>
+		/// 首次归档意见
+		/// </summary>
+		public string? FirstFileOpinion { get; set; }
+
+		/// <summary>
+		/// 上次归档意见
+		/// </summary>
+		public string? LastFileOpinion { get; set; }
+
 
 		/// <summary>
 		/// 特提节点

src/Hotline/Orders/Order.cs

@@ -972,10 +972,27 @@ namespace Hotline.Orders
         }
 
         /// <summary>
-        /// 发布
-        /// </summary>
-        /// <param name="isPublicity"></param>
-        public void Publish(bool isPublicity)
+        /// 特提之后 归档信息清空
+        /// </summary>
+        public void FileEmpty() {
+            FiledTime = null;
+			HandleDurationWorkday = 0;
+            HandleDuration = 0;
+			FileDurationWorkday = 0;
+            FileDuration = 0;
+			AllDurationWorkday = 0;
+            AllDuration = 0;
+			CreationTimeHandleDurationWorkday = 0;
+            CreationTimeHandleDuration = 0;
+			CenterToOrgHandleDurationWorkday = 0;
+            CenterToOrgHandleDuration = 0;
+		}
+
+		/// <summary>
+		/// 发布
+		/// </summary>
+		/// <param name="isPublicity"></param>
+		public void Publish(bool isPublicity)
         {
             //Progress = EProgress.Published;
             Status = EOrderStatus.Published;

src/Hotline/Orders/OrderSpecial.cs

@@ -113,6 +113,17 @@ namespace Hotline.Orders
 		[Navigate(NavigateType.OneToMany, nameof(OrderSpecialDetail.SpecialId))]
 		public List<OrderSpecialDetail> ReTransactError { get; set; }
 
+		/// <summary>
+		/// 首次归档意见
+		/// </summary>
+		[SugarColumn(ColumnDataType = "varchar(8000)")]
+		public string? FirstFileOpinion { get; set; }
+
+		/// <summary>
+		/// 上次归档意见
+		/// </summary>
+		[SugarColumn(ColumnDataType = "varchar(8000)")]
+		public string? LastFileOpinion { get; set; }
 
 	}