Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/OrderController.cs

@@ -5373,6 +5373,10 @@ public class OrderController : BaseController
         if (orderId.NotNullOrEmpty())
         {
             dto.Opinion = await _typeCache.GetAsync($"tmp_opinion_{orderId}{_sessionContext.UserId}", HttpContext.RequestAborted);
+            if (!string.IsNullOrEmpty(dto.Opinion))
+            {
+                dto.Opinion = await _typeCache.GetAsync($"tmp_opinion_{orderId}{dto.StepId}{_sessionContext.UserId}", HttpContext.RequestAborted);
+            }
             dto.Content = (await _orderRepository.GetAsync(orderId, HttpContext.RequestAborted))?.Content;
         }
 
@@ -5909,7 +5913,9 @@ public class OrderController : BaseController
     public async Task TempSaveAsync([FromBody] StepTempInDto dto)
     {
         if (dto.OrderId.IsNullOrEmpty() || dto.Opinion.IsNullOrEmpty()) return;
-        await _typeCache.SetAsync($"tmp_opinion_{dto.OrderId}{_sessionContext.UserId}", dto.Opinion, TimeSpan.FromDays(3),
+        //获取配置
+        int days = int.Parse(_systemSettingCacheManager.GetSetting(SettingConstants.TempOpinionDays)?.SettingValue[0]);
+        await _typeCache.SetAsync($"tmp_opinion_{dto.OrderId}{dto.StepId}{_sessionContext.UserId}", dto.Opinion, TimeSpan.FromDays(days),
             HttpContext.RequestAborted);
     }
 

src/Hotline.Share/Dtos/FlowEngine/NextStepsDto.cs

@@ -156,6 +156,11 @@ public class StepTempInDto
     /// </summary>
     public string OrderId { get; set; }
 
+    /// <summary>
+    /// 节点ID
+    /// </summary>
+    public string StepId { get; set; }
+
     /// <summary>
     /// 意见
     /// </summary>

src/Hotline/Settings/SettingConstants.cs

@@ -795,5 +795,10 @@ namespace Hotline.Settings
         /// ip白名单
         /// </summary>
         public const string WhiteIp = "WhiteIp";
+
+        /// <summary>
+        /// 临时保存天数
+        /// </summary>
+        public const string TempOpinionDays = "TempOpinionDays";
     }
 }