1

gx_api/GxPress/Model/GxPress.Request/Notice/NoticeInRequest.cs

@@ -96,5 +96,15 @@ namespace GxPress.Request.Notice
         /// </summary>
         /// <value></value>
         public int SonId { get; set; }
+         /// <summary>
+        /// 发件人
+        /// </summary>
+        /// <value></value>
+        public string SendUserName { get; set; }
+        /// <summary>
+        /// 发件人用户ID
+        /// </summary>
+        /// <value></value>
+        public int SendUserId { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/Notice/NoticeListPageResult.cs

@@ -21,6 +21,11 @@ namespace GxPress.Result.Notice
         /// </summary>
         public string UserName { get; set; }
         /// <summary>
+        /// 工作审核人
+        /// </summary>
+        /// <value></value>
+        public string FlowUserName { get; set; }
+        /// <summary>
         /// 内容
         /// </summary>
         /// <value></value>
@@ -110,10 +115,47 @@ namespace GxPress.Result.Notice
         /// </summary>
         /// <value></value>
         public int SourceId { get; set; }
-         /// <summary>
+        /// <summary>
         ///  5 通知 6站内信 15 我审批的 16 我发出的 17 抄送我的
         /// </summary>
         /// <value></value>
         public int TypeValue { get; set; }
+        /// <summary>
+        /// 发件人
+        /// </summary>
+        /// <value></value>
+        public string SendUserName { get; set; }
+        /// <summary>
+        /// 发件人用户ID
+        /// </summary>
+        /// <value></value>
+        public int SendUserId { get; set; }
+        /// <summary>
+        /// 工作未处理数量
+        /// </summary>
+        /// <value></value>
+        public int UCheckedCount { get; set; }
+        /// <summary>
+        /// 工作已处理数量
+        /// </summary>
+        /// <value></value>
+        public int CheckedCount { get; set; }
+
+        /// <summary>
+        /// 工作是否处理 我审批的
+        /// </summary>
+        /// <value></value>
+        public bool IsFlowChecked { get; set; }
+
+        /// <summary>
+        /// 工作是否阅读 抄送我的 
+        /// </summary>
+        /// <value></value>
+        public bool IsFlowRead { get; set; }
+        /// <summary>
+        /// 工作是否阅读 我发起的
+        /// </summary>
+        /// <value></value>
+        public bool IsMyFlowRead { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/NoticeRepository.cs

@@ -91,7 +91,7 @@ namespace GxPress.Repository.Implement
                         SourceId = request.SoureId,
                         IsDelete = false,
                         IsTop = false,
-                        SonId=request.SonId
+                        SonId = request.SonId
                     };
                     noticeId = await _repository.InsertAsync(notice);
                     transactionScope.Complete();
@@ -370,6 +370,61 @@ namespace GxPress.Repository.Implement
             }
             var noticeTypeValue = GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode();
             var sql = $@"SELECT a.*,(SELECT GROUP_CONCAT(SourceName Separator'、') from tede_user_middle where MiddleType=10 and DataSourceId=a.MiddleId) as EnjoyUser,(SELECT 
+                                                        GROUP_CONCAT(Name
+                                                                SEPARATOR '、')
+                                                    FROM
+                                                        tede_user
+                                                    WHERE
+                                                        Id IN (SELECT 
+                                                                UserId
+                                                            FROM
+                                                                tede_flow_todo
+                                                            WHERE
+                                                                FlowId = b.SourceId
+                        AND type = 'ApproverCheck')) AS FlowUserName,
+                        (SELECT 
+                                    COUNT(1)
+                                FROM
+                                    tede_flow_todo
+                                WHERE
+                                    FlowId = b.SourceId
+                                        AND type = 'ApproverCheck'
+                                        AND IsDone = 0
+                                        AND IsChecked = 0) AS UCheckedCount,
+                            (SELECT 
+                                    COUNT(1)
+                                FROM
+                                    tede_flow_todo
+                                WHERE
+                                    FlowId = b.SourceId
+                                        AND type = 'ApproverCheck'
+                                        AND IsDone = 1
+                                        AND IsChecked = 1) AS CheckedCount,
+                                        (SELECT 
+                                                IsRead
+                                            FROM
+                                                tede_flow_todo
+                                            WHERE
+                                                UserId = a.UserId
+                                                    AND FlowId = b.SourceId
+                                                    AND Type = 'CarbonCopy'
+                                            LIMIT 1) AS IsFlowRead,
+                                        (SELECT 
+                                                IsRead
+                                            FROM
+                                                tede_flow_todo
+                                            WHERE
+                                                UserId = b.UserId
+                                                    AND FlowId = b.SourceId
+                                                    AND Type = 'ApproverCheck'
+                                            LIMIT 1) AS IsFlowChecked,
+                                        (SELECT 
+                                                IsRead
+                                            FROM
+                                                tede_flow
+                                            WHERE
+                                                id = b.SourceId AND UserId = b.UserId) AS IsMyFlowRead,
+                        (SELECT 
                             COUNT(1)
                         FROM
                             tede_analyze

gx_api/GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Actions1.Add.cs

@@ -35,7 +35,9 @@ namespace GxPress.Service.Implement
                 Title = $"{user.Name}的{process.Name}流程",
                 UserId = flow.UserId,
                 SoureId = flow.Id,
-                TypeValue = AllTypeConst.MySubmitted.GetHashCode()
+                TypeValue = AllTypeConst.MySubmitted.GetHashCode(),
+                SendUserId = user.Id,
+                SendUserName = user.Name
             });
             foreach (var flowField in flow.Fields)
             {
@@ -75,7 +77,9 @@ namespace GxPress.Service.Implement
                             UserId = todo.UserId,
                             SoureId = flow.Id,
                             SonId = flowTodoId,
-                            TypeValue = AllTypeConst.MyChecked.GetHashCode()
+                            TypeValue = AllTypeConst.MyChecked.GetHashCode(),
+                            SendUserId = user.Id,
+                            SendUserName = user.Name
                         });
                 }
             }
@@ -100,7 +104,9 @@ namespace GxPress.Service.Implement
                         UserId = todo.UserId,
                         SoureId = flow.Id,
                         SonId = flowTodoId,
-                        TypeValue = AllTypeConst.MyCc.GetHashCode()
+                        TypeValue = AllTypeConst.MyCc.GetHashCode(),
+                        SendUserId = user.Id,
+                        SendUserName = user.Name
                     });
                 }
             }

gx_api/GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Actions2.Check.cs

@@ -88,7 +88,9 @@ namespace GxPress.Service.Implement
                                 UserId = flow.UserId,
                                 SoureId = flow.Id,
                                 SonId = item.Id,
-                                TypeValue = AllTypeConst.MyChecked.GetHashCode()
+                                TypeValue = AllTypeConst.MyChecked.GetHashCode(),
+                                SendUserId = user.Id,
+                                SendUserName = user.Name
                             });
                         }
                     }
@@ -103,7 +105,9 @@ namespace GxPress.Service.Implement
                             UserId = flow.UserId,
                             SoureId = flow.Id,
                             SonId = flowTodo.Id,
-                            TypeValue = AllTypeConst.MyChecked.GetHashCode()
+                            TypeValue = AllTypeConst.MyChecked.GetHashCode(),
+                            SendUserId = user.Id,
+                            SendUserName = user.Name
                         });
                     }
                 }
@@ -209,6 +213,10 @@ namespace GxPress.Service.Implement
             var todo = await _flowTodoRepository.GetAsync(todoId);
             // await _flowTodoRepository.DeleteAsync(todo.Id);
             var flow = await GetAsync(todo.FlowId);
+            //获取用户
+            var user = await _userRepository.GetAsync(flow.UserId);
+            //获取
+            var process = await _processRepository.GetAsync(flow.ProcessId);
             await _flowMessageRepository.InsertAsync(new FlowMessage
             {
                 ProcessId = flow.ProcessId,
@@ -247,8 +255,21 @@ namespace GxPress.Service.Implement
                 flowTo.Type = nameof(TodoTypeConst.ApproverCheck);
                 flowTo.IsOperate = sort == 1 ? true : false;
                 flowTo.Sort = todo.Sort + sort;
-                await _flowTodoRepository.InsertAsync(flowTo);
+                var flowToId = await _flowTodoRepository.InsertAsync(flowTo);
                 sort++;
+                //专审收件箱
+                if (flowTo.IsOperate)
+                    await _noticeService.AddNoticeFlowAsync(new NoticeInRequest
+                    {
+                        NoticeType = NoticeTypeConst.Send,
+                        Title = $"{user.Name}的{process.Name}流程",
+                        UserId = flow.UserId,
+                        SoureId = flow.Id,
+                        SonId = flowToId,
+                        TypeValue = AllTypeConst.MyChecked.GetHashCode(),
+                        SendUserId = user.Id,
+                        SendUserName = user.Name
+                    });
             }
             //修改当前用户状态
             todo.Message = message;
@@ -259,6 +280,7 @@ namespace GxPress.Service.Implement
             //已转审
             todo.IsReferral = true;
             await _flowTodoRepository.UpdateAsync(todo);
+
         }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Notice/NoticeService.cs

@@ -133,7 +133,7 @@ namespace GxPress.Service.Implement.Notice
             result.PraiseCount = praiseCount;
             //是否点赞
             result.IsPraise = await _analyzeService.ExistsAsync(analyzeRequest);
-            var request = new PraisePageSearchRequest { SourceId = id, TypeValue =AllTypeConst.Notice.GetHashCode(), Page = 1, PerPage = 3 };
+            var request = new PraisePageSearchRequest { SourceId = id, TypeValue = AllTypeConst.Notice.GetHashCode(), Page = 1, PerPage = 3 };
             result.NoticePraisePagedList = await _analyzeService.GetPraisePageAsync(request);
             //是否是当前用户创建
             result.IsAdmin = notice.UserId == userId;
@@ -315,7 +315,7 @@ namespace GxPress.Service.Implement.Notice
             }
             return true;
         }
-       
+
         /// <summary>
         /// 根据已读未读查询通知数据
         /// </summary>
@@ -337,6 +337,22 @@ namespace GxPress.Service.Implement.Notice
             var result = await _noticeRepository.GetNoticeListPageAsync(request);
             foreach (var item in result.Items)
             {
+                if (item.TypeValue > 0)
+                {
+                    item.UserName = item.SendUserName;
+                    item.ReadCount = item.CheckedCount;
+                    item.UReadCount = item.UCheckedCount;
+                    item.EnjoyUser = item.FlowUserName;
+                    //我发起的
+                    if (item.TypeValue == AllTypeConst.MySubmitted.GetHashCode())
+                        item.IsRead = item.IsMyFlowRead;
+                    //我抄送
+                    if (item.TypeValue == AllTypeConst.MyCc.GetHashCode())
+                        item.IsRead = item.IsFlowRead;
+                    //我审批
+                    if (item.TypeValue == AllTypeConst.MyChecked.GetHashCode())
+                        item.IsRead = item.IsFlowChecked;
+                }
                 item.Title = _contentJsonService.GetTitile(item.Title, item.Content);
                 if (item.IsDelete == true)
                     item.NoticeStatus = 0;
@@ -360,7 +376,7 @@ namespace GxPress.Service.Implement.Notice
                 using (TransactionScope transactionScope = new TransactionScope())
                 {
                     //删除middle
-                    await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType),GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), false));
+                    await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType), GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), false));
                     //修改为草稿箱
                     await _middleRepository.UpdateAsync(Q.Where(nameof(Entity.Middle.Middle.MiddleId), id).Where(nameof(Entity.Middle.Middle.FolderType), GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode()).Where(nameof(Entity.Middle.Middle.IsAdmin), true).Set(nameof(Entity.Middle.Middle.NoticeAddresseeType), 2));
                     //修改