11

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

@@ -91,6 +91,7 @@ namespace GxPress.Api.AppControllers
             if (flow.Id > 0)
                 await _flowService.DeleteAsync(flow.Id);
             flow.Id = await _flowService.AddAsync(flow);
+            await _flowService.AddInboxAsyc(flow);
             return flow;
         }
 

gx_api/GxPress/Repository/GxPress.Repository.Implement/MiddleRepository.cs

@@ -266,7 +266,7 @@ namespace GxPress.Repository.Implement
                 query.OrWhere(nameof(Middle.Content), request.KeyWord);
             }
             query.Where(nameof(Middle.UserId), request.UserId);
-            return await _repository.GetAllAsync(query);
+            return await _repository.GetAllAsync(query.Select("Id", "Guid", "CreatedDate", "LastModifiedDate", "FolderName", "FolderType", "IsTop", "RoleId", "Sort", "MiddleId", "ParentId", "UserId", "MiddleSonId", "IsRead", "NoticeAddresseeType", "IsAdmin", "IsDelete", "AttributeValue", "IsDefault", "IsUpload", "Title", "AddressUser", "CcUser"));
         }
     }
 }

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

@@ -17,7 +17,7 @@ namespace GxPress.Service.Implement
         /// <returns></returns>
         public async Task<int> AddAsync(FlowDto flow)
         {
-            flow.Id = await _flowRepository.InsertAsync(new Flow
+            flow.Id = await _flowRepository.InsertAsync(new Entity.WorkFlow.Flow
             {
                 State = FlowState.Checking,
                 ProcessId = flow.ProcessId,
@@ -114,7 +114,7 @@ namespace GxPress.Service.Implement
             var flow = await GetAsync(flowId);
             if (flow == null) return 0;
 
-            flow.Id = await _flowRepository.InsertAsync(new 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.Inbox.cs

@@ -0,0 +1,77 @@
+using System.Threading.Tasks;
+using GxPress.Entity.WorkFlowDto;
+using System.Linq;
+using Datory;
+using System.Collections.Generic;
+
+namespace GxPress.Service.Implement
+{
+    public partial class FlowService
+    {
+        public async Task<bool> AddInboxAsyc(FlowDto flow)
+        {
+            var user = await _userRepository.GetAsync(flow.UserId);
+            var process = await _processRepository.GetAsync(flow.ProcessId);
+            //获取收件人
+            //获取抄送人
+            var flowDtos = await _flowTodoRepository.GetListByFlowIdAsync(flow.Id);
+            var addressUserIds = flowDtos.Where(n => n.Type == nameof(GxPress.EnumConst.TodoTypeConst.ApproverCheck)).Select(n => n.UserId).ToList();
+            var ccUserIds = flowDtos.Where(n => n.Type == nameof(GxPress.EnumConst.TodoTypeConst.CarbonCopy)).Select(n => n.UserId).ToList();
+            //收件人
+            var addressUsers = await _userRepository.GetAllAsync(Q.WhereIn(nameof(Entity.User.Id), addressUserIds));
+            //抄送人
+            var ccUsers = await _userRepository.GetAllAsync(Q.WhereIn(nameof(Entity.User.Id), ccUserIds));
+            //中间件
+            var middles = new List<Entity.Middle.Middle>();
+            var middle = new Entity.Middle.Middle
+            {
+                MiddleId = flow.Id,
+                FolderType = GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode(),
+                IsTop = false,
+                AttributeValue = 1,
+                ParentId = 0,
+                UserId = flow.UserId,
+                MiddleSonId = 0,
+                IsAdmin = false,
+                NoticeAddresseeType = 0,
+                Title = $"{user.Name}{process.Name}申请",
+                IsRead = false,
+                TitleLong = "",
+                Content = "",
+                AddressUserComplete = Common.Tools.StringUtils.ObjectCollectionToString(addressUsers.Select(n => n.Name)),
+                AddressUser = Common.Tools.StringUtils.ObjectCollectionToString(addressUsers.Select(n => n.Name), 10),
+                CcUserComplete = Common.Tools.StringUtils.ObjectCollectionToString(ccUsers.Select(n => n.Name)),
+                CcUser = Common.Tools.StringUtils.ObjectCollectionToString(ccUsers.Select(n => n.Name), 10),
+            };
+            middles.Add(middle);
+            var users = addressUsers.ToList();
+            users.AddRange(ccUsers);
+            foreach (var item in users.Distinct())
+            {
+                middle = new Entity.Middle.Middle
+                {
+                    MiddleId = flow.Id,
+                    FolderType = GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode(),
+                    IsTop = false,
+                    AttributeValue = 1,
+                    ParentId = 0,
+                    UserId = flow.UserId,
+                    MiddleSonId = 0,
+                    IsAdmin = false,
+                    NoticeAddresseeType = 0,
+                    Title = $"{user.Name}{process.Name}申请",
+                    IsRead = false,
+                    TitleLong = "",
+                    Content = "",
+                    AddressUserComplete = Common.Tools.StringUtils.ObjectCollectionToString(addressUsers.Select(n => n.Name)),
+                    AddressUser = Common.Tools.StringUtils.ObjectCollectionToString(addressUsers.Select(n => n.Name), 10),
+                    CcUserComplete = Common.Tools.StringUtils.ObjectCollectionToString(ccUsers.Select(n => n.Name)),
+                    CcUser = Common.Tools.StringUtils.ObjectCollectionToString(ccUsers.Select(n => n.Name), 10),
+                };
+                middles.Add(middle);
+            }
+            await middleRepository.InsertAsync(middles);
+            return true;
+        }
+    }
+}

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

@@ -130,7 +130,7 @@ namespace GxPress.Service.Implement
             };
         }
 
-        private async Task<IEnumerable<FlowListResult>> GetFlowListResultListAsync(IEnumerable<Flow> flowList, string source = "")
+        private async Task<IEnumerable<FlowListResult>> GetFlowListResultListAsync(IEnumerable<Entity.WorkFlow.Flow> flowList, string source = "")
         {
             var resultList = flowList.Select(async x =>
             {
@@ -159,7 +159,7 @@ namespace GxPress.Service.Implement
             return await Task.WhenAll(resultList);
         }
 
-        private async Task<FlowListResult> GetFlowListResultAsync(Flow flow, int todoId, string source = "")
+        private async Task<FlowListResult> GetFlowListResultAsync(Entity.WorkFlow.Flow flow, int todoId, string source = "")
         {
             var user = await _userRepository.GetAsync(flow.UserId);
             //获取todo

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

@@ -5,6 +5,7 @@ using GxPress.Service.Interface;
 using GxPress.Service.Interface.Notice;
 using Microsoft.AspNetCore.Hosting;
 using GxPress.Repository.Interface.FlowAttachment;
+
 namespace GxPress.Service.Implement
 {
     public partial class FlowService : IFlowService
@@ -25,6 +26,7 @@ namespace GxPress.Service.Implement
         private readonly IDepartmentRepository _departmentRepository;
         private readonly INoticeService _noticeService;
         private readonly IFlowAttachmentRepository flowAttachmentRepository;
+        private readonly IMiddleRepository middleRepository;
 
         public FlowService(
             IWebHostEnvironment environment,
@@ -40,7 +42,7 @@ namespace GxPress.Service.Implement
             IFlowFieldValueRepository flowFieldValueRepository,
             IProcessService processService,
             IUserRepository userRepository,
-            IDepartmentRepository departmentRepository, INoticeService noticeService,IFlowAttachmentRepository flowAttachmentRepository
+            IDepartmentRepository departmentRepository, INoticeService noticeService, IFlowAttachmentRepository flowAttachmentRepository, IMiddleRepository middleRepository
             )
         {
             _environment = environment;
@@ -58,10 +60,12 @@ namespace GxPress.Service.Implement
             _userRepository = userRepository;
             _departmentRepository = departmentRepository;
             _noticeService = noticeService;
-            this.flowAttachmentRepository=flowAttachmentRepository;
+            this.flowAttachmentRepository = flowAttachmentRepository;
+            this.middleRepository = middleRepository;
         }
 
 
+
         //public void OnFlowAdded(FlowDto flow)
         //{
         //    flow.

gx_api/GxPress/Service/GxPress.Service.Implement/Missive/MissiveService.cs

@@ -5,7 +5,6 @@ using Datory;
 using GxPress.Common.Exceptions;
 using GxPress.Common.Page;
 using GxPress.Common.Tools;
-using GxPress.Entity.Missive;
 using GxPress.EnumConst;
 using GxPress.Repository.Interface;
 using GxPress.Repository.Interface.Missive;
@@ -20,7 +19,6 @@ using GxPress.Service.Interface.Missive;
 using GxPress.Service.Interface.UserMiddle;
 using Newtonsoft.Json;
 using IMapper = AutoMapper.IMapper;
-using System;
 using System.Transactions;
 using GxPress.Entity;
 using GxPress.Service.Interface.ContentJson;

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

@@ -188,8 +188,8 @@ namespace GxPress.Service.Implement.Notice
                                 Content = request.Content,
                                 AddressUserComplete = Common.Tools.StringUtils.ObjectCollectionToString(addresseeUsers.Select(n => n.Name)),
                                 AddressUser = Common.Tools.StringUtils.ObjectCollectionToString(addresseeUsers.Select(n => n.Name), 10),
-                                CcUserComplete = Common.Tools.StringUtils.ObjectCollectionToString(addresseeUsers.Select(n => n.Name)),
-                                CcUser = Common.Tools.StringUtils.ObjectCollectionToString(addresseeUsers.Select(n => n.Name), 10),
+                                CcUserComplete = Common.Tools.StringUtils.ObjectCollectionToString(ccUsers.Select(n => n.Name)),
+                                CcUser = Common.Tools.StringUtils.ObjectCollectionToString(ccUsers.Select(n => n.Name), 10),
                             };
                             middles.Add(middle);
                         }

gx_api/GxPress/Service/GxPress.Service.Interface/IFlowService.cs

@@ -72,5 +72,7 @@ namespace GxPress.Service.Interface
         /// <param name="flow"></param>
         /// <returns></returns>
         Task NodeExecuteSwitchAsync(FlowDto flow, ProcessNodeDto processNode);
+
+        Task<bool> AddInboxAsyc(FlowDto flow);
     }
 }