1

gx_api/GxPress/Model/GxPress.Entity/Notice.cs

@@ -73,6 +73,11 @@ namespace GxPress.Entity
         /// </summary>
         [DataColumn]
         public int SourceId { get; set; }
-
+        /// <summary>
+        /// 子集
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int SonId { get; set; }
     }
 }

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

@@ -91,5 +91,10 @@ namespace GxPress.Request.Notice
         /// </summary>
         /// <value></value>
         public int ParentId { get; set; }
+        /// <summary>
+        /// 子
+        /// </summary>
+        /// <value></value>
+        public int SonId { get; set; }
     }
 }

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

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using GxPress.Common.Page;
-using GxPress.EnumConst;
 
 namespace GxPress.Request.Notice
 {

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

@@ -90,7 +90,8 @@ namespace GxPress.Repository.Implement
                         HtmlContent = request.HtmlContent,
                         SourceId = request.SoureId,
                         IsDelete = false,
-                        IsTop = true
+                        IsTop = false,
+                        SonId=request.SonId
                     };
                     noticeId = await _repository.InsertAsync(notice);
                     transactionScope.Complete();

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

@@ -5,6 +5,7 @@ using GxPress.Common.Tools;
 using GxPress.Entity.WorkFlow;
 using GxPress.Entity.WorkFlowDto;
 using GxPress.EnumConst;
+using GxPress.Request.Notice;
 
 namespace GxPress.Service.Implement
 {
@@ -17,6 +18,10 @@ namespace GxPress.Service.Implement
         /// <returns></returns>
         public async Task<int> AddAsync(FlowDto flow)
         {
+            //获取用户
+            var user = await _userRepository.GetAsync(flow.UserId);
+            //获取
+            var process = await _processRepository.GetAsync(flow.ProcessId);
             flow.Id = await _flowRepository.InsertAsync(new Entity.WorkFlow.Flow
             {
                 State = FlowState.Checking,
@@ -24,7 +29,14 @@ namespace GxPress.Service.Implement
                 UserId = flow.UserId,
                 IsRead = false
             });
-
+            await _noticeService.AddNoticeFlowAsync(new NoticeInRequest
+            {
+                NoticeType = NoticeTypeConst.Send,
+                Title = $"{user.Name}的{process.Name}",
+                UserId = flow.UserId,
+                SoureId = flow.Id,
+                TypeValue = AllTypeConst.MySubmitted.GetHashCode()
+            });
             foreach (var flowField in flow.Fields)
             {
                 await _flowFieldValueRepository.InsertAsync(new FlowFieldValue
@@ -53,7 +65,18 @@ namespace GxPress.Service.Implement
                         IsDone = false,
                         IsOperate = i == 0,
                     };
-                    await _flowTodoRepository.InsertAsync(todo);
+                    var flowTodoId = await _flowTodoRepository.InsertAsync(todo);
+                    //添加工作收件箱
+                    if (todo.IsOperate)
+                        await _noticeService.AddNoticeFlowAsync(new NoticeInRequest
+                        {
+                            NoticeType = NoticeTypeConst.Send,
+                            Title = $"{user.Name}的{process.Name}",
+                            UserId = todo.UserId,
+                            SoureId = flow.Id,
+                            SonId = flowTodoId,
+                            TypeValue = AllTypeConst.MyChecked.GetHashCode()
+                        });
                 }
             }
             if (flow.CarbonCopyUserIds != null)
@@ -69,10 +92,18 @@ namespace GxPress.Service.Implement
                         IsDone = false,
                         IsOperate = false
                     };
-                    await _flowTodoRepository.InsertAsync(todo);
+                    var flowTodoId = await _flowTodoRepository.InsertAsync(todo);
+                    await _noticeService.AddNoticeFlowAsync(new NoticeInRequest
+                    {
+                        NoticeType = NoticeTypeConst.Send,
+                        Title = $"{user.Name}的{process.Name}",
+                        UserId = todo.UserId,
+                        SoureId = flow.Id,
+                        SonId = flowTodoId,
+                        TypeValue = AllTypeConst.MyCc.GetHashCode()
+                    });
                 }
             }
-
             var nodes = await _processService.GetAllAsync(flow.ProcessId);
 
             foreach (var processNodeDto in nodes.Where(n => n.ParentId == 0))
@@ -90,7 +121,7 @@ namespace GxPress.Service.Implement
                 if (processNodeDto.Type == nameof(ProcessNodeTypeConst.Switch))
                 {
                     //工作流条件
-                    await NodeExecuteSwitchAsync(flow,processNodeDto);
+                    await NodeExecuteSwitchAsync(flow, processNodeDto);
                 }
                 if (processNodeDto.Type == nameof(ProcessNodeTypeConst.End))
                 {
@@ -114,7 +145,7 @@ namespace GxPress.Service.Implement
             var flow = await GetAsync(flowId);
             if (flow == null) return 0;
 
-            flow.Id = await _flowRepository.InsertAsync(new  Entity.WorkFlow.Flow
+            flow.Id = await _flowRepository.InsertAsync(new Entity.WorkFlow.Flow
             {
                 ProcessId = flow.ProcessId,
                 State = FlowState.Checking,

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

@@ -22,7 +22,9 @@ namespace GxPress.Service.Implement
         /// <returns></returns>
         public async Task CheckAsync(int todoId, bool isChecked, string message)
         {
+
             var todo = await _flowTodoRepository.GetAsync(todoId);
+
             todo.IsChecked = isChecked;
             todo.Message = message;
             todo.IsDone = true;
@@ -31,6 +33,10 @@ namespace GxPress.Service.Implement
             todo.DoneType = 0;
             var updated = await _flowTodoRepository.UpdateAsync(todo);
             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,
@@ -75,12 +81,30 @@ namespace GxPress.Service.Implement
                         {
                             item.IsOperate = true;
                             await _flowTodoRepository.UpdateAsync(item);
+                            await _noticeService.AddNoticeFlowAsync(new NoticeInRequest
+                            {
+                                NoticeType = NoticeTypeConst.Send,
+                                Title = $"{user.Name}的{process.Name}",
+                                UserId = flow.UserId,
+                                SoureId = flow.Id,
+                                SonId = item.Id,
+                                TypeValue = AllTypeConst.MyChecked.GetHashCode()
+                            });
                         }
                     }
                     else
                     {
                         flowTodo.IsOperate = true;
                         await _flowTodoRepository.UpdateAsync(flowTodo);
+                        await _noticeService.AddNoticeFlowAsync(new NoticeInRequest
+                        {
+                            NoticeType = NoticeTypeConst.Send,
+                            Title = $"{user.Name}的{process.Name}",
+                            UserId = flow.UserId,
+                            SoureId = flow.Id,
+                            SonId = flowTodo.Id,
+                            TypeValue = AllTypeConst.MyChecked.GetHashCode()
+                        });
                     }
                 }
                 // ProcessNodeDto nextApproverNode = null;

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

@@ -7,6 +7,7 @@ using GxPress.Request.App.Middle;
 using GxPress.Request.Notice;
 using GxPress.EnumConst;
 using System.Linq;
+using System.Transactions;
 using System.Collections.Generic;
 using Datory;
 
@@ -219,5 +220,43 @@ namespace GxPress.Service.Implement.Notice
             }
             return true;
         }
+        /// <summary>
+        /// 添加收件箱工作
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<bool> AddNoticeFlowAsync(NoticeInRequest request)
+        {
+            try
+            {
+                using (var transactionScope = new TransactionScope())
+                {
+                    var noticeId = await _noticeRepository.InsertAsync(request);
+                    if (noticeId == 0) return false;
+                    var middleInsertTypes = new MiddleInsertTypeRequest
+                    {
+                        FolderId = request.FolderId,
+                        MiddleId = noticeId,
+                        FolderType = GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode(),
+                        UserId = request.UserId,
+                        MiddleSonId = 0,
+                        NoticeAddresseeType = request.NoticeType,
+                        AttributeValue = 1,
+                        Title = _contentJsonService.GetTitile(request.Title, request.Content),
+                        IsAdmin = true,
+                        TitleLong = request.Title,
+                        Content = request.Content,
+                    };
+                    //添加自己
+                    var middleId = await _middleService.InsertAsync(middleInsertTypes);
+                    transactionScope.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/Notice/INoticeService.cs

@@ -53,5 +53,11 @@ namespace GxPress.Service.Interface.Notice
         /// <param name="id"></param>
         /// <returns></returns>
         Task<bool> RecallAsync(int id);
+        /// <summary>
+        /// 添加收件箱工作
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<bool> AddNoticeFlowAsync(NoticeInRequest request);
     }
 }