1

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

@@ -2,7 +2,6 @@ using System;
 using System.Threading.Tasks;
 using Datory;
 using GxPress.Common.Tools;
-using GxPress.EnumConst;
 using GxPress.Result;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

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

@@ -122,48 +122,6 @@ namespace GxPress.Api.AppControllers
         /// 获取工作项列表
         /// </summary>
         /// <returns></returns>
-        [HttpGet]
-        [AllowAnonymous]
-        public async Task<ListResult> List([FromQuery] FlowListRequest request)
-        {
-            var userId = _loginContext.AccountId;
-
-            if (request.Type == nameof(FlowListTypeConst.MyChecking))
-            {
-                return await _flowService.ListMyCheckingAsync(userId, request, nameof(FlowListTypeConst.MyChecking));
-            }
-
-            if (request.Type == nameof(FlowListTypeConst.MyChecked))
-            {
-                return await _flowService.ListMyCheckedAsync(userId, request, nameof(FlowListTypeConst.MyChecked));
-            }
-
-            if (request.Type == nameof(FlowListTypeConst.CcUnread))
-            {
-                return await _flowService.ListCcUnreadAsync(userId, request);
-            }
-
-            if (request.Type == nameof(FlowListTypeConst.CcAll))
-            {
-                return await _flowService.ListCcAllAsync(userId, request);
-            }
-
-            if (request.Type == nameof(FlowListTypeConst.SubmittedChecking))
-            {
-                return await _flowService.ListSubmittedCheckingAsync(userId, request);
-            }
-
-            if (request.Type == nameof(FlowListTypeConst.SubmittedChecked))
-            {
-                return await _flowService.ListSubmittedCheckedAsync(userId, request);
-            }
-
-            return new ListResult();
-        }
-        /// <summary>
-        /// 获取工作项列表
-        /// </summary>
-        /// <returns></returns>
         [HttpPost("list")]
         public async Task<ListResult> PostList(FlowListRequest request)
         {

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

@@ -109,6 +109,98 @@ namespace GxPress.Repository.Implement.WorkFlow
                 .Where(nameof(FlowTodo.FlowId), flowId)
             ) > 0;
         }
+        /// <summary>
+        /// 已审批
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="type"></param>
+        /// <param name="isDone"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<Flow>> GetMyCheckedTodoIdFlowIdListAsync(int userId, string type, bool isDone, FlowListRequest request)
+        {
+            string sql = $@"
+                           SELECT 
+                                *
+                            FROM
+                                tede_flow
+                            WHERE
+                                Id IN (
+                           SELECT 
+                                FlowId
+                            FROM
+                                tede_flow_todo a
+                                    INNER JOIN
+                                tede_process b ON a.ProcessId = b.id
+                                    INNER JOIN
+                                tede_flow c ON c.Id = a.FlowId
+                                 INNER JOIN
+                                 tede_user d on d.Id=a.UserId
+                                 INNER JOIN
+                                 tede_user e on e.Id=c.UserId
+                            WHERE
+                                a.UserId = {userId}
+                                    AND a.Type = '{type}'";
+            if (isDone)
+                sql += $@"AND a.IsDone = 1";
+            else sql += $@"AND a.IsDone = 0 AND a.IsOperate = 1";
+            if (!string.IsNullOrWhiteSpace(request.Keyword))
+            {
+                sql += $@" AND (b.Name LIKE '%{request.Keyword}%'
+                                    OR a.FlowId IN (SELECT 
+                                        FlowId
+                                    FROM
+                                        tede_flow_field_value
+                                    WHERE
+                                        StringValues LIKE '%{request.Keyword}%')
+                                    OR c.UserId IN (SELECT 
+                                        Id
+                                    FROM
+                                        tede_user
+                                    WHERE
+                                        Name LIKE '%{request.Keyword}%') 
+                                        or a.FlowId In(SELECT 
+                                                                                    FlowId
+                                                                                FROM
+                                                                                    tede_flow_todo
+                                                                                WHERE
+                                                                                    UserId IN (SELECT 
+                                                                                            Id
+                                                                                        FROM
+                                                                                            tede_user
+                                                                                        WHERE
+                                                                                            Name LIKE '%{request.Keyword}%'))
+                                                or a.FlowId In(SELECT 
+                                                                    FlowId
+                                                                FROM
+                                                                    tede_flow_message
+                                                                WHERE
+                                                                    Message LIKE '%{request.Keyword}%'))";
+            }
+            if (request.ProcessIds.Count > 0)
+            {
+                var processId = "";
+                foreach (var item in request.ProcessIds)
+                {
+                    if (item == 0)
+                        continue;
+                    processId += $"{item},";
+                }
+                if (!string.IsNullOrWhiteSpace(processId))
+                {
+                    processId = processId.Remove(processId.Length - 1, 1);
+                    sql += $" AND b.Id IN ({processId})";
+                }
+            }
+            sql += $") ORDER BY a.CreatedDate DESC limit {(request.Page - 1) * request.PerPage},{request.PerPage}";
+            var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            var result =
+               await connection
+                    .QueryAsync<Flow>(sql);
+            return result;
+        }
 
         public async Task<IEnumerable<(int TodoId, int FlowId)>> GetTodoIdFlowIdListAsync(int userId, string type, bool isDone, FlowListRequest request)
         {
@@ -314,6 +406,7 @@ namespace GxPress.Repository.Implement.WorkFlow
                     .ExecuteScalarAsync<int>(sql);
             return result;
         }
+
         public async Task<int> GetCountAsync(int userId, string type, bool isDone, FlowListRequest request)
         {
 
@@ -389,58 +482,97 @@ namespace GxPress.Repository.Implement.WorkFlow
                await connection
                     .ExecuteScalarAsync<int>(sql);
             return result;
-            // var query = Q
-            //     .Select(nameof(FlowTodo.FlowId))
-            //     .WhereNot(nameof(FlowTodo.ProcessId), 0)
-            //     .Where(nameof(FlowTodo.UserId), userId)
-            //     .Where(nameof(FlowTodo.Type), type)
-            //     .Where(nameof(FlowTodo.IsDone), isDone)
-            //     .OrderByDesc(nameof(FlowTodo.Id));
-            // if (type == nameof(TodoTypeConst.ApproverCheck) && !isDone)
-            // {
-            //     query.Where(nameof(FlowTodo.IsOperate), true);
-            // }
-            // if (request.ProcessIds != null && request.ProcessIds.Any() && !request.ProcessIds.Contains(0))
-            // {
-            //     query.WhereIn(nameof(FlowTodo.ProcessId), request.ProcessIds);
-            // }
-            // #region 新增
-            // if (!string.IsNullOrWhiteSpace(request.Keyword))
-            // {
-            //     //获取用户
-            //     var users = await _userRepository.GetAllAsync(Q.WhereLike(nameof(Entity.User.Name), $"%{request.Keyword}%"));
-            //     if (users.Count > 0)
-            //     {
-            //         //获取
-            //         var flow = await _flowRepository.GetAllAsync(Q.WhereIn(nameof(Flow.UserId), users.Select(n => n.Id)));
-            //         var flowTodosApproverCheck = await _repository.GetAllAsync(Q.WhereIn(nameof(FlowTodo.UserId), users.Select(n => n.Id)).Where(nameof(FlowTodo.Type), "ApproverCheck"));
-            //         var flowTodosCarbonCopy = await _repository.GetAllAsync(Q.WhereIn(nameof(FlowTodo.UserId), users.Select(n => n.Id)).Where(nameof(FlowTodo.Type), "CarbonCopy"));
-            //         var flowIds = new List<int>();
-            //         if (flow.Count > 0)
-            //             flowIds.AddRange(flow.Select(n => n.Id));
-            //         //审批人
-            //         if (flowTodosApproverCheck.Count > 0)
-            //             flowIds.AddRange(flowTodosApproverCheck.Select(n => n.FlowId));
-            //         //抄送人
-            //         if (flowTodosCarbonCopy.Count > 0)
-            //             flowIds.AddRange(flowTodosCarbonCopy.Select(n => n.FlowId));
-            //         query.WhereIn(nameof(FlowTodo.FlowId), flowIds);
-            //     }
-            //     else
-            //     {
-            //         var flowFieldValues = await _flowFieldValueRepository.GetAllAsync(Q.WhereLike(nameof(FlowFieldValue.StringValue), $"%{request.Keyword}%"));
-            //         query.WhereIn(nameof(Flow.Id), flowFieldValues.Select(n => n.FlowId));
-            //         if (flowFieldValues.Count() == 0)
-            //         {
-            //             var processList = await _processRepository.GetAllAsync(Q.WhereLike(nameof(Entity.WorkProcess.Process.Name), $"%{request.Keyword}%"));
-            //             query.WhereIn(nameof(Flow.ProcessId), processList.Select(n => n.Id));
-            //         }
-            //         else
-            //             query.WhereIn(nameof(Flow.Id), flowFieldValues.Select(n => n.FlowId));
-            //     }
-            // }
-            // #endregion
-            // return await _repository.CountAsync(query);
+        }
+        /// <summary>
+        /// 已审批数量
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="type"></param>
+        /// <param name="isDone"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<int> GetMyCheckedCountAsync(int userId, string type, bool isDone, FlowListRequest request)
+        {
+            string sql = $@"
+                        SELECT 
+                                count(1)
+                            FROM
+                                tede_flow
+                            WHERE
+                                Id IN (
+                           SELECT 
+                               a.FlowId
+                            FROM
+                                tede_flow_todo a
+                                    INNER JOIN
+                                tede_process b ON a.ProcessId = b.id
+                                    INNER JOIN
+                                tede_flow c ON c.Id = a.FlowId
+                                INNER JOIN
+                                 tede_user d on d.Id=a.UserId
+                                 INNER JOIN
+                                 tede_user e on e.Id=c.UserId
+                            WHERE
+                                a.UserId = {userId}
+                                    AND a.Type = '{type}'";
+            if (isDone)
+                sql += $@" AND a.IsDone = 1";
+            else sql += $@" AND a.IsDone = 0 AND a.IsOperate = 1";
+            if (!string.IsNullOrWhiteSpace(request.Keyword))
+            {
+                sql += $@" AND (b.Name LIKE '%{request.Keyword}%'
+                                    OR a.FlowId IN (SELECT 
+                                        FlowId
+                                    FROM
+                                        tede_flow_field_value
+                                    WHERE
+                                        StringValues LIKE '%{request.Keyword}%')
+                                    OR c.UserId IN (SELECT 
+                                        Id
+                                    FROM
+                                        tede_user
+                                    WHERE
+                                        Name LIKE '%{request.Keyword}%') or a.FlowId In(SELECT 
+                                                                                    FlowId
+                                                                                FROM
+                                                                                    tede_flow_todo
+                                                                                WHERE
+                                                                                    UserId IN (SELECT 
+                                                                                            Id
+                                                                                        FROM
+                                                                                            tede_user
+                                                                                        WHERE
+                                                                                            Name LIKE '%{request.Keyword}%'))
+                                                                or a.FlowId In(SELECT 
+                                                                    FlowId
+                                                                FROM
+                                                                    tede_flow_message
+                                                                WHERE
+                                                                    Message LIKE '%{request.Keyword}%'))";
+            }
+            if (request.ProcessIds.Count > 0)
+            {
+                var processId = "";
+                foreach (var item in request.ProcessIds)
+                {
+                    if (item == 0)
+                        continue;
+                    processId += $"{item},";
+                }
+                if (!string.IsNullOrWhiteSpace(processId))
+                {
+                    processId = processId.Remove(processId.Length - 1, 1);
+                    sql += $" AND b.Id IN ({processId})";
+                }
+            }
+            sql += ")";
+            var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            var result =
+               await connection
+                    .ExecuteScalarAsync<int>(sql);
+            return result;
         }
         /// <summary>
         /// 未读数量

GxPress/Repository/GxPress.Repository.Interface/WorkFlow/IFlowTodoRepository.cs

@@ -79,6 +79,24 @@ namespace GxPress.Repository.Interface.WorkFlow
         /// </summary>
         /// <param name="flowId"></param>
         /// <returns></returns>
-       Task<FlowTodo> GetUCheckedAsync(int flowId);
+        Task<FlowTodo> GetUCheckedAsync(int flowId);
+        /// <summary>
+        /// 已审批
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="type"></param>
+        /// <param name="isDone"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<IEnumerable<Flow>> GetMyCheckedTodoIdFlowIdListAsync(int userId, string type, bool isDone, FlowListRequest request);
+        /// <summary>
+        /// 已审批数量
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="type"></param>
+        /// <param name="isDone"></param>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<int> GetMyCheckedCountAsync(int userId, string type, bool isDone, FlowListRequest request);
     }
 }

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

@@ -47,20 +47,18 @@ namespace GxPress.Service.Implement
 
         public async Task<ListResult> ListMyCheckedAsync(int userId, FlowListRequest request, string source = "")
         {
-            var todoIdFlowIdList = await _flowTodoRepository.GetTodoIdFlowIdListAsync(userId, nameof(TodoTypeConst.ApproverCheck), true, request);
+            var flowList = await _flowTodoRepository.GetMyCheckedTodoIdFlowIdListAsync(userId, nameof(TodoTypeConst.ApproverCheck), true, request);
             var items = new List<FlowListResult>();
-            foreach (var todoIdFlowId in todoIdFlowIdList)
+            foreach (var flow in flowList)
             {
-                var flow = await _flowRepository.GetAsync(todoIdFlowId.FlowId);
                 if (flow != null)
                 {
-                    items.Add(await GetFlowListResultAsync(flow, todoIdFlowId.TodoId, source));
+                    items.Add(await GetFlowListResultAsync(flow, flow.Id, source));
                 }
             }
-
             return new ListResult
             {
-                Count = await _flowTodoRepository.GetCountAsync(userId, nameof(TodoTypeConst.ApproverCheck), true, request),
+                Count = await _flowTodoRepository.GetMyCheckedCountAsync(userId, nameof(TodoTypeConst.ApproverCheck), true, request),
                 Items = items
             };
         }