1

GxPress/Api/GxPress.Api/AppControllers/AppFlowController.cs

@@ -97,14 +97,14 @@ namespace GxPress.Api.AppControllers
         /// <summary>
         /// 获取详情
         /// </summary>
-        /// <param name="id"></param>
+        /// <param name="todoId"></param>
         /// <returns></returns>
-        [HttpGet("{id}")]
+        [HttpGet("{todoId}")]
         [AllowAnonymous]
-        public async Task<FlowResult> Get(int id)
+        public async Task<FlowResult> Get(int todoId)
         {
-            await _flowTodoRepository.UpdateCCIsDoneAsync(_loginContext.AccountId, id);
-            return await _flowService.GetFlowResult(id, _loginContext.AccountId);
+            await _flowTodoRepository.UpdateCCIsDoneAsync(_loginContext.AccountId, todoId);
+            return await _flowService.GetFlowResult(todoId, _loginContext.AccountId);
         }
         /// <summary>
         /// 获取详情 web专属

GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowTodoRepository.cs

@@ -723,10 +723,11 @@ namespace GxPress.Repository.Implement.WorkFlow
             var result = await connection.ExecuteAsync(sql);
             return result > 0;
         }
-        public async Task UpdateCCIsDoneAsync(int userId, int flowId)
+        public async Task UpdateCCIsDoneAsync(int userId, int todoId)
         {
-            await UpdateReadAsync(userId, flowId);
-            await UpdateFlowReadAsync(userId, flowId);
+            var flowTodo = await _repository.GetAsync(todoId);
+            await UpdateReadAsync(userId, flowTodo.FlowId);
+            await UpdateFlowReadAsync(userId, flowTodo.FlowId);
         }
 
         public async Task DeleteCheckingByFlowIdAsync(int flowId)

GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Get.cs

@@ -77,8 +77,10 @@ namespace GxPress.Service.Implement
             return (GetFlowName(user, process), new List<string>());
         }
 
-        public async Task<FlowResult> GetFlowResult(int flowId, int userId = 0)
+        public async Task<FlowResult> GetFlowResult(int todoId, int userId = 0)
         {
+            var flowTodeDto = await _flowTodoRepository.GetAsync(todoId);
+            var flowId = flowTodeDto.FlowId;
             var flowDto = await GetAsync(flowId);
             var user = await _userRepository.GetAsync(flowDto.UserId);
             var avatarUrl = await _userRepository.GetAvatarUrlAsync(flowDto.UserId);
@@ -205,7 +207,7 @@ namespace GxPress.Service.Implement
             if (userId > 0)
             {
                 //获取副流程
-                var flowToDo = await _flowTodoRepository.GetAsync(Q.Where(nameof(Entity.WorkFlow.FlowTodo.UserId), userId).Where(nameof(Entity.WorkFlow.FlowTodo.FlowId), flowId).Where(nameof(Entity.WorkFlow.FlowTodo.Type), nameof(TodoTypeConst.ApproverCheck)).OrderByDesc(nameof(Entity.WorkFlow.FlowTodo.CreatedDate)));
+                var flowToDo = flowTodeDto;
                 if (flowToDo != null)
                 {
                     if (flowToDo.IsDone && flowToDo.IsChecked)

GxPress/Service/GxPress.Service.Implement/Flow/FlowService.List.cs

@@ -92,7 +92,7 @@ namespace GxPress.Service.Implement
 
         public async Task<ListResult> ListCcUnreadAsync(int userId, FlowListRequest request)
         {
-            var todoIdFlowIdList = await _flowTodoRepository.GetTodoIdFlowIdListAsync(userId, nameof(TodoTypeConst.CarbonCopy), request,false);
+            var todoIdFlowIdList = await _flowTodoRepository.GetTodoIdFlowIdListAsync(userId, nameof(TodoTypeConst.CarbonCopy), request, false);
             var items = new List<FlowListResult>();
             foreach (var todoIdFlowId in todoIdFlowIdList)
             {
@@ -105,14 +105,14 @@ namespace GxPress.Service.Implement
 
             return new ListResult
             {
-                Count = await _flowTodoRepository.GetReadCountAsync(userId, nameof(TodoTypeConst.CarbonCopy), request,false),
+                Count = await _flowTodoRepository.GetReadCountAsync(userId, nameof(TodoTypeConst.CarbonCopy), request, false),
                 Items = items
             };
         }
 
         public async Task<ListResult> ListCcAllAsync(int userId, FlowListRequest request, string source = "")
         {
-            var todoIdFlowIdList = await _flowTodoRepository.GetTodoIdFlowIdListAsync(userId, nameof(TodoTypeConst.CarbonCopy), request,true);
+            var todoIdFlowIdList = await _flowTodoRepository.GetTodoIdFlowIdListAsync(userId, nameof(TodoTypeConst.CarbonCopy), request, true);
             var items = new List<FlowListResult>();
             foreach (var todoIdFlowId in todoIdFlowIdList)
             {
@@ -125,7 +125,7 @@ namespace GxPress.Service.Implement
 
             return new ListResult
             {
-                Count = await _flowTodoRepository.GetReadCountAsync(userId, nameof(TodoTypeConst.CarbonCopy), request,true),
+                Count = await _flowTodoRepository.GetReadCountAsync(userId, nameof(TodoTypeConst.CarbonCopy), request, true),
                 Items = items
             };
         }
@@ -166,7 +166,7 @@ namespace GxPress.Service.Implement
             var tode = await _flowTodoRepository.GetAsync(todoId);
             var result = new FlowListResult
             {
-                Id = flow.Id,
+                Id = todoId,
                 TodoId = todoId,
                 ProcessId = flow.ProcessId,
                 UserId = flow.UserId,