1

gx_api/GxPress/Api/GxPress.Api/AppControllers/AppFlowController.Actions.cs

@@ -152,5 +152,18 @@ namespace GxPress.Api.AppControllers
                 Value = await _flowService.ActionsWait(request.FlowId, _loginContext.AccountId)
             };
         }
+        /// <summary>
+        /// 撤回
+        /// </summary>
+        /// <param name="flowId"></param>
+        /// <returns></returns>
+        [HttpGet("action/recall/{flowId}")]
+        public async Task<DefaultResult> RecallAsync(int flowId)
+        {
+            return new DefaultResult
+            {
+                Value = await _flowService.RecallAsync(flowId, _loginContext.AccountId)
+            };
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Recall.cs

@@ -0,0 +1,37 @@
+using System.Threading.Tasks;
+using Datory;
+using GxPress.EnumConst;
+using System.Transactions;
+namespace GxPress.Service.Implement
+{
+    public partial class FlowService
+    {
+        /// <summary>
+        /// 撤回
+        /// </summary>
+        /// <param name="flowId"></param>
+        /// <returns></returns>
+        public async Task<bool> RecallAsync(int flowId, int userId)
+        {
+            try
+            {
+                using (var transactions = new TransactionScope())
+                {
+                    var flow = await _flowRepository.GetAsync(flowId);
+                    if (flow == null || flow.UserId != userId)
+                        throw new Common.Exceptions.BusinessException("非本人操作！");
+                    //删除middle
+                    await middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode()).Where(nameof(Entity.Middle.Middle.MiddleId), flowId).WhereNot(nameof(Entity.Middle.Middle.UserId), flow.UserId));
+                    //修改状态
+                    await middleRepository.UpdateAsync(Q.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode()).Where(nameof(Entity.Middle.Middle.MiddleId), flowId).Where(nameof(Entity.Middle.Middle.UserId), flow.UserId).Set(nameof(Entity.Middle.Middle.IsRecall), true));
+                    transactions.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Interface/IFlowService.cs

@@ -19,23 +19,23 @@ namespace GxPress.Service.Interface
 
         Task<(string Title, List<string> Summaries)> GetFlowTitleAndSummaryAsync(User user, int processId, int flowId);
 
-        Task<FlowResult> GetFlowResult(int flowId,int userId=0);
+        Task<FlowResult> GetFlowResult(int flowId, int userId = 0);
 
         Task<int> GetTodoCountAsync(int userId);
 
         Task<ListResult> ListAllAsync(int page, int perPage, int processId, string state, string startDate, string endDate);
 
-        Task<ListResult> ListMyCheckingAsync(int userId, FlowListRequest request,string source="");
+        Task<ListResult> ListMyCheckingAsync(int userId, FlowListRequest request, string source = "");
 
-        Task<ListResult> ListMyCheckedAsync(int userId, FlowListRequest request,string source="");
+        Task<ListResult> ListMyCheckedAsync(int userId, FlowListRequest request, string source = "");
 
-        Task<ListResult> ListSubmittedCheckingAsync(int userId, FlowListRequest request,string source="");
+        Task<ListResult> ListSubmittedCheckingAsync(int userId, FlowListRequest request, string source = "");
 
         Task<ListResult> ListSubmittedCheckedAsync(int userId, FlowListRequest request);
 
         Task<ListResult> ListCcUnreadAsync(int userId, FlowListRequest request);
 
-        Task<ListResult> ListCcAllAsync(int userId, FlowListRequest request,string source="");
+        Task<ListResult> ListCcAllAsync(int userId, FlowListRequest request, string source = "");
 
         Task<IEnumerable<FlowTodo>> GetTodoListAsync(int userId, int page, int perPage, int processId);
 
@@ -50,23 +50,23 @@ namespace GxPress.Service.Interface
         Task<string> DownloadAsync(int flowId);
 
         Task<int> ReAddAsync(int flowId);
-          /// <summary>
+        /// <summary>
         /// 上会等待
         /// </summary>
         /// <param name="flowId"></param>
         /// <param name="userId"></param>
         /// <returns></returns>
-       Task<bool> ActionsWait(int flowId, int userId);
+        Task<bool> ActionsWait(int flowId, int userId);
 
-         /// <summary>
+        /// <summary>
         /// 获取用户ID
         /// </summary>
         /// <param name="node"></param>
         /// <returns></returns>
-       Task<List<int>> GetListUserAsync(ProcessNodeDto node);
+        Task<List<int>> GetListUserAsync(ProcessNodeDto node);
 
-       Task<bool> RemindAsync(int flowId, int userId);
-         /// <summary>
+        Task<bool> RemindAsync(int flowId, int userId);
+        /// <summary>
         /// 工作流程条件判断
         /// </summary>
         /// <param name="flow"></param>
@@ -74,5 +74,11 @@ namespace GxPress.Service.Interface
         Task NodeExecuteSwitchAsync(FlowDto flow, ProcessNodeDto processNode);
 
         Task<bool> AddInboxAsyc(FlowDto flow);
+        /// <summary>
+        /// 撤回
+        /// </summary>
+        /// <param name="flowId"></param>
+        /// <returns></returns>
+        Task<bool> RecallAsync(int flowId,int userId);
     }
 }