瀏覽代碼

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

Dun.Jason 6 月之前
父節點
當前提交
0f4b0c7574
共有 1 個文件被更改,包括 14 次插入17 次删除
  1. 14 17
      src/Hotline.Api/Controllers/OrderController.cs

+ 14 - 17
src/Hotline.Api/Controllers/OrderController.cs

@@ -84,6 +84,7 @@ public class OrderController : BaseController
     private readonly ISystemOrganizeRepository _organizeRepository;
     private readonly IDefinitionDomainService _definitionDomainService;
     private readonly ISystemDicDataCacheManager _sysDicDataCacheManager;
+    private readonly ITypedCache<string> _typeCache;
     private readonly ISessionContext _sessionContext;
     private readonly IMapper _mapper;
     private readonly IMediator _mediator;
@@ -204,7 +205,8 @@ public class OrderController : BaseController
         ICallNativeApplication callNativeApplication,
         IRepository<OrderRevoke> orderRevokeRepository,
         BaseDataApplication baseDataApplication,
-        IOrderTerminateRepository orderTerminateRepository)
+        IOrderTerminateRepository orderTerminateRepository,
+        ITypedCache<string> typeCache)
     {
         _orderDomainService = orderDomainService;
         _orderRepository = orderRepository;
@@ -270,6 +272,7 @@ public class OrderController : BaseController
         _baseDataApplication = baseDataApplication;
         _orderTerminateRepository = orderTerminateRepository;
         _orderRevokeRepository = orderRevokeRepository;
+        _typeCache = typeCache;
         _cityBaseConfiguration = cityBaseConfiguration;
         _baseDataApplication = baseDataApplication;
     }
@@ -3595,20 +3598,6 @@ public class OrderController : BaseController
         await _workflowApplication.NextAsync(dto, order.ExpiredTime, HttpContext.RequestAborted);
     }
 
-    /// <summary>
-    /// 临时保存
-    /// </summary>
-    [HttpPost("steps/temp")]
-    public async Task TempSaveAsync([FromBody] StepTempInDto dto)
-    {
-        await _workflowStepRepository.GetAsync(dto.StepId)
-            .Then(async (step) =>
-            {
-                step!.Opinion = dto.Opinion;
-                await _workflowStepRepository.UpdateAsync(step);
-            });
-    }
-
     /// <summary>
     /// 查询工单办理下一步可选节点(带推荐部门)
     /// </summary>
@@ -3635,8 +3624,7 @@ public class OrderController : BaseController
             .Select(m => new Kv { Key = m.Id, Value = m.DicDataName }).ToList();
         if (_appOptions.Value.IsZiGong)
         {
-            await _workflowStepRepository.GetAsync(dto.StepId)
-                .Then(step => rsp.Opinion = step!.Opinion ?? string.Empty);
+            rsp.Opinion = await _typeCache.GetAsync($"tmp_opinion_{orderId}{_sessionContext.UserId}", HttpContext.RequestAborted);
         }
 
         rsp.TranspondCity = _sysDicDataCacheManager.GetSysDicDataCache(SysDicTypeConsts.TranspondCity)
@@ -3644,6 +3632,15 @@ public class OrderController : BaseController
         return rsp;
     }
 
+    /// <summary>
+    /// 临时保存
+    /// </summary>
+    [HttpPost("steps/temp")]
+    public async Task TempSaveAsync([FromBody] StepTempInDto dto)
+    {
+        await _typeCache.SetAsync($"tmp_opinion_{dto.OrderId}{_sessionContext.UserId}", dto.Opinion, TimeSpan.FromDays(3), HttpContext.RequestAborted);
+    }
+
     /// <summary>
     /// 查询工单办理下一步可选节点(带推荐部门)
     /// </summary>