Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -92,6 +92,10 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class UnionDocumentWithConfirmInfoView : UnionDocumentView
     {
+        public DocUserSignType SysDocUserSignType { get; set; }
+
+        public bool IsConfirmIdentityUserInner { get; set; }
+
         public Guid TrialId { get; set; }
 
         public bool IsNeedSendEmial { get; set; }

IRaCIS.Core.Application/Service/Document/Interface/ITrialDocumentService.cs

@@ -19,6 +19,8 @@ namespace IRaCIS.Core.Application.Contracts
         Task<IResponseOutput> UserConfirm(UserConfirmCommand userConfirmCommand);
         Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId);
 
+        Task<IResponseOutput<PageOutput<UnionDocumentWithConfirmInfoView>>> GetSysDocumentConfirmList(SystemDocQuery inQuery);
+
 
         //Task<PageOutput<DocumentUnionWithUserStatView>> GetTrialSystemDocumentList(DocumentTrialUnionQuery querySystemDocument);
         //List<TrialUserUnionDocumentView> GetTrialUserDocumentList(Guid trialId);

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -952,10 +952,13 @@ namespace IRaCIS.Core.Application.Services
                 return ResponseOutput.Ok(new PageOutput<UnionDocumentWithConfirmInfoView>());
             }
 
+
             var systemDocQuery =
-               from sysDoc in _systemDocumentRepository.AsQueryable(false)
+               from sysDoc in _systemDocumentRepository.Where(t => t.IsPublish)
                                               .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
-               from identityUser in _identityUserRepository.AsQueryable(false).Where(t => t.Status == UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
+               from identityUser in _identityUserRepository.AsQueryable(false)
+
+                  .Where(t => t.Status == UserStateEnum.Enable && t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserTypeId)))
                   .Where(t => inQuery.UserId != null ? t.Id == inQuery.UserId : true)
                   .Where(t => inQuery.UserTypeId != null ? t.UserRoleList.Any(t => t.UserTypeId == inQuery.UserTypeId && t.IsUserRoleDisabled == false) : true)
                   .Where(t => isEA ? t.IsZhiZhun == true : true) //EA 只能查看内部人员文档
@@ -964,6 +967,8 @@ namespace IRaCIS.Core.Application.Services
                select new UnionDocumentWithConfirmInfoView()
                {
                    IsSystemDoc = true,
+                   SysDocUserSignType = sysDoc.DocUserSignType,
+                   IsConfirmIdentityUserInner = identityUser.IsZhiZhun,
                    Id = sysDoc.Id,
                    CreateTime = sysDoc.CreateTime,
                    IsDeleted = sysDoc.IsDeleted,
@@ -995,14 +1000,16 @@ namespace IRaCIS.Core.Application.Services
                };
 
             var unionQuery = systemDocQuery.IgnoreQueryFilters().Where(t => !(t.IsDeleted == true && t.ConfirmTime == null))
+                            //外部人员 只签署 外部需要签署的    
+                            .Where(t => t.IsConfirmIdentityUserInner == false ? t.SysDocUserSignType == DocUserSignType.InnerAndOuter : true)
                             .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                             .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                             .WhereIf(inQuery.IsConfirmed == true, t => t.ConfirmTime != null)
                             .WhereIf(inQuery.IsConfirmed == false, t => t.ConfirmTime == null)
                             .WhereIf(inQuery.StartConfirmTime != null, t => t.ConfirmTime >= inQuery.StartConfirmTime.Value)
                             .WhereIf(inQuery.EndConfirmTime != null, t => t.ConfirmTime <= inQuery.EndConfirmTime.Value)
-                             .WhereIf(inQuery.BeginCreateTime != null, t => t.CreateTime >= inQuery.BeginCreateTime)
-                             .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime)
+                            .WhereIf(inQuery.BeginCreateTime != null, t => t.CreateTime >= inQuery.BeginCreateTime)
+                            .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime)
                             .WhereIf(!string.IsNullOrEmpty(inQuery.UserName), t => t.UserName.Contains(inQuery.UserName))
                             .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
                             .WhereIf(isInternal == false, t => t.ConfirmTime != null); //不是内部的人，看有签名时间的