1

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

@@ -369,18 +369,7 @@ namespace GxPress.Repository.Implement
                     sb += " AND a.ParentId = " + request.NoticeFolderId;
             }
             var noticeTypeValue = GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode();
-            var sql = $@"SELECT a.*,(select count(1) from tede_flow where id=b.SourceId and UserId={request.UserId}) as IsAdmin,
-                         (SELECT 
-                            Name
-                        FROM
-                            tede_user
-                        WHERE
-                            id = (SELECT 
-                                    userId
-                                FROM
-                                    tede_flow
-                                WHERE
-                                    id = b.SourceId)) as UserName,
+            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
@@ -537,7 +526,18 @@ namespace GxPress.Repository.Implement
                 FROM
                     tede_addressee
                 WHERE
-    SourceId = a.MiddleId AND IsRead = 1 and UserId={request.UserId} limit 0,1) as IsRead, b.*, c.AvatarUrl, d.Id as NoticeAddresseeId,d.SourceId as NoticeId
+               SourceId = a.MiddleId AND IsRead = 1 and UserId={request.UserId} limit 0,1) as IsRead, b.*, c.AvatarUrl, d.Id as NoticeAddresseeId,d.SourceId as NoticeId,(SELECT 
+                            Name
+                        FROM
+                            tede_user
+                        WHERE
+                            id = (SELECT 
+                                    userId
+                                FROM
+                                    tede_flow
+                                WHERE
+                                    id = b.SourceId)) as UserName
+                                    ,(select count(1) from tede_flow where id=b.SourceId and UserId={request.UserId}) as IsAdmin
                                     FROM
                                         tede_middle a
                                             left   JOIN

gx_api/GxPress/Repository/GxPress.Repository.Implement/WorkFlow/FlowRepository.cs

@@ -93,7 +93,10 @@ namespace GxPress.Repository.Implement.WorkFlow
             );
             return id;
         }
-
+        public async Task<bool> UpdateAsync(Entity.WorkFlow.Flow flow)
+        {
+            return await _repository.UpdateAsync(flow);
+        }
         public async Task<Flow> GetAsync(int flowId)
         {
             return await _repository.GetAsync(flowId);
@@ -373,8 +376,8 @@ namespace GxPress.Repository.Implement.WorkFlow
         {
             return await _repository.DeleteAsync(flowId);
         }
-        
-  
+
+
 
         public async Task UpdateStateAsync(int flowId, string state)
         {

gx_api/GxPress/Repository/GxPress.Repository.Interface/WorkFlow/IFlowRepository.cs

@@ -30,15 +30,16 @@ namespace GxPress.Repository.Interface.WorkFlow
 
         Task UpdateProcessNodeIdAsync(int flowId, int processNodeId);
 
-         /// <summary>
+        /// <summary>
         /// 新增 未读数量
         /// </summary>
         /// <param name="userId"></param>
         /// <param name="checking"></param>
         /// <param name="request"></param>
         /// <returns></returns>
-       Task<int> GetUReadCountByUserIdAsync(int userId, bool checking, FlowListRequest request);
+        Task<int> GetUReadCountByUserIdAsync(int userId, bool checking, FlowListRequest request);
 
-       Task<int> CountAsync(SqlKata.Query query);
+        Task<int> CountAsync(SqlKata.Query query);
+        Task<bool> UpdateAsync(Entity.WorkFlow.Flow flow);
     }
 }

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

@@ -20,10 +20,26 @@ namespace GxPress.Service.Implement
                     var flow = await _flowRepository.GetAsync(flowId);
                     if (flow == null || flow.UserId != userId)
                         throw new Common.Exceptions.BusinessException("非本人操作！");
+                    var query = Q.NewQuery();
+                    query.Where(nameof(Entity.Notice.SourceId), flowId);
+                    query.Where(nameof(Entity.Notice.TypeValue), AllTypeConst.MySubmitted.GetHashCode());
+                    query.Where(nameof(Entity.Notice.UserId), userId);
+                    var notice = await _noticeRepository.GetAsync(query);
+                    if (notice == null)
+                        return false;
                     //删除middle
-                    await middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode()).Where(nameof(Entity.Middle.Middle.MiddleId), flowId).WhereNot(nameof(Entity.Middle.Middle.UserId), flow.UserId));
+                    query = Q.NewQuery();
+                    query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode());
+                    query.Where(nameof(Entity.Middle.Middle.MiddleId), notice.Id);
+                    query.WhereNot(nameof(Entity.Middle.Middle.UserId), flow.UserId);
+                    await middleRepository.DeleteAsync(query);
                     //修改状态
-                    await middleRepository.UpdateAsync(Q.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode()).Where(nameof(Entity.Middle.Middle.MiddleId), flowId).Where(nameof(Entity.Middle.Middle.UserId), flow.UserId).Set(nameof(Entity.Middle.Middle.IsRecall), true));
+                    query = Q.NewQuery();
+                    query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Inbox.GetHashCode());
+                    query.Where(nameof(Entity.Middle.Middle.MiddleId), notice.Id);
+                    query.Where(nameof(Entity.Middle.Middle.UserId), flow.UserId);
+                    query.Set(nameof(Entity.Middle.Middle.IsRecall), true);
+                    await middleRepository.UpdateAsync(query);
                     transactions.Complete();
                 }
             }

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

@@ -25,6 +25,7 @@ namespace GxPress.Service.Implement
         private readonly IUserRepository _userRepository;
         private readonly IDepartmentRepository _departmentRepository;
         private readonly INoticeService _noticeService;
+        private readonly INoticeRepository _noticeRepository;
         private readonly IFlowAttachmentRepository flowAttachmentRepository;
         private readonly IMiddleRepository middleRepository;
 
@@ -42,7 +43,11 @@ namespace GxPress.Service.Implement
             IFlowFieldValueRepository flowFieldValueRepository,
             IProcessService processService,
             IUserRepository userRepository,
-            IDepartmentRepository departmentRepository, INoticeService noticeService, IFlowAttachmentRepository flowAttachmentRepository, IMiddleRepository middleRepository
+            IDepartmentRepository departmentRepository,
+            INoticeService noticeService,
+            IFlowAttachmentRepository flowAttachmentRepository,
+            IMiddleRepository middleRepository,
+            INoticeRepository _noticeRepository
             )
         {
             _environment = environment;
@@ -62,10 +67,9 @@ namespace GxPress.Service.Implement
             _noticeService = noticeService;
             this.flowAttachmentRepository = flowAttachmentRepository;
             this.middleRepository = middleRepository;
+            this._noticeRepository = _noticeRepository;
         }
 
-
-
         //public void OnFlowAdded(FlowDto flow)
         //{
         //    flow.