李昊 4 years ago
parent
commit
e40b929de4

+ 1 - 0
gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowTodoRepository.cs

@@ -727,6 +727,7 @@ namespace GxPress.Repository.Implement.WorkFlow
         {
             await UpdateReadAsync(userId, flowId);
             await UpdateFlowReadAsync(userId, flowId);
+            
         }
 
         public async Task DeleteCheckingByFlowIdAsync(int flowId)

+ 4 - 5
gx_api/GxPress/Service/GxPress.Service.Implement/UserService.cs

@@ -354,13 +354,12 @@ namespace GxPress.Service.Implement
             var result = await _userRepository.GetUserCountAsync(userId);
             //工作我的审批未操作数量
             var request = new FlowListRequest();
-            result.FlowAuditUReadCount = await _flowTodoRepository.GetCountAsync(userId, nameof(TodoTypeConst.ApproverCheck), false,
-                    request);
+            result.FlowAuditUReadCount = await _flowTodoRepository.CountAsync(Q.Where(nameof(Entity.WorkFlow.FlowTodo.UserId),userId).Where(nameof(Entity.WorkFlow.FlowTodo.Type),"ApproverCheck").Where(nameof(Entity.WorkFlow.FlowTodo.IsRead),false));
             // 工作我发起的已批复未读数量
-            var flowState = new List<string> { FlowState.Checked.GetValue(), FlowState.Denied.GetValue() };
-            result.FlowSendUReadCount = await _flowRepository.CountAsync(Q.Where(nameof(Entity.WorkFlow.Flow.UserId), userId).WhereIn(nameof(Entity.WorkFlow.Flow.State), flowState).Where(nameof(Entity.WorkFlow.Flow.IsRead), false).Where(nameof(Entity.WorkFlow.Flow.ProcessId), ">", 0));
+            // var flowState = new List<string> { FlowState.Checked.GetValue(), FlowState.Denied.GetValue() };
+            // result.FlowSendUReadCount = await _flowRepository.CountAsync(Q.Where(nameof(Entity.WorkFlow.Flow.UserId), userId).WhereIn(nameof(Entity.WorkFlow.Flow.State), flowState).Where(nameof(Entity.WorkFlow.Flow.IsRead), false).Where(nameof(Entity.WorkFlow.Flow.ProcessId), ">", 0));
             // 工作抄送我的未读数量
-            result.FlowCcUReadCount = await _flowTodoRepository.FlowCcUReadCountAsync(userId);
+           // result.FlowCcUReadCount = await _flowTodoRepository.FlowCcUReadCountAsync(userId);
             //待办事项未执行数量
             result.WaitHandleUFinishCount = await waitHandleRepository.GetUFinishAsync(userId);
             return result;