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

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -1536,12 +1536,6 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.AuditDocumentService.MovieFileOrFolder(IRaCIS.Core.Application.ViewModel.MovieFileOrFolderInDto)">
-            <summary>
-            移动文件或者文件夹 到其他文件夹
-            </summary>
-            <returns></returns>
-        </member>
         <member name="M:IRaCIS.Core.Application.Service.AuditDocumentService.DeleteAuditDocument(IRaCIS.Core.Application.ViewModel.DeleteAuditDocumentInDto)">
             <summary>
             删除稽查文档
@@ -1562,6 +1556,12 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.AuditDocumentService.MovieFileOrFolder(IRaCIS.Core.Application.ViewModel.MovieFileOrFolderInDto)">
+            <summary>
+            移动文件或者文件夹 到其他文件夹
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.AuditDocumentService.CopyFileOrFolder(IRaCIS.Core.Application.ViewModel.MovieFileOrFolderInDto)">
             <summary>
             复制文件或者文件夹

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

@@ -911,12 +911,15 @@ namespace IRaCIS.Core.Application.Services
 
             var isInternal = _userInfo.IsZhiZhun;
 
+            var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
+
             var systemDocQuery =
                from sysDoc in _systemDocumentRepository.AsQueryable(false)
                                               .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)))
                   .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 只能查看内部人员文档
                join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = identityUser.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                from confirm in cc.DefaultIfEmpty()
                select new UnionDocumentWithConfirmInfoView()
@@ -956,13 +959,13 @@ namespace IRaCIS.Core.Application.Services
                              .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);
+                            .WhereIf(isInternal == false, t => t.ConfirmTime != null); //不是内部的人，看有签名时间的
 
             var result = await unionQuery.ToPagedListAsync(inQuery);
 
             #region 处理文档 需要签署的角色类型  和每个人的角色信息
 
-            var trialDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == false).Select(t => t.Id).ToList();
+            //var trialDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == false).Select(t => t.Id).ToList();
 
             var sysDocIdList = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
 

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

@@ -155,7 +155,7 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(d => d.IdentityUserList, c => c.MapFrom(t => t.AuditRecordIdentityUserList));
 
             CreateMap<AuditRecordAddOrEdit, AuditRecord>()
-                 .ForMember(d => d.AuditRecordIdentityUserList, c => c.MapFrom(t => t.IdnetityUserIdList));
+                /* .ForMember(d => d.AuditRecordIdentityUserList, c => c.MapFrom(t => t.IdnetityUserIdList))*/;
 
             CreateMap<Guid, AuditRecordIdentityUser>()
                  .EqualityComparison((odto, o) => odto == o.IdentityUserId)

IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs

@@ -317,6 +317,8 @@ namespace IRaCIS.Application.Contracts
         public UserCeateSource? UserCeateSource { get; set; }
 
         public Guid? AuditRecordId { get; set; }
+
+        public bool? IsAuditRecordUserSelect { get; set; }
     }
 
     public class UserRoleInfoDTO

IRaCIS.Core.Application/Service/Management/UserService.cs

@@ -516,6 +516,8 @@ namespace IRaCIS.Core.Application.Service
                  .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser)
                  .WhereIf(inQuery.IsZhiZhun != null, t => t.IsZhiZhun == inQuery.IsZhiZhun)
                  .WhereIf(inQuery.UserCeateSource != null, t => t.UserCeateSource == inQuery.UserCeateSource)
+                 .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == true, t => t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
+                 .WhereIf(inQuery.AuditRecordId != null && inQuery.IsAuditRecordUserSelect == false, t => !t.AuditRecordList.Any(t => t.AuditRecordId == inQuery.AuditRecordId))
                  .ProjectTo<UserListDTO>(_mapper.ConfigurationProvider);
 
             var pageList = await userQueryable.ToPagedListAsync(inQuery);

IRaCIS.Core.Application/TestService.cs

@@ -81,7 +81,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="_auditDocumentRepository"></param>
         /// <returns></returns>
         [AllowAnonymous]
-        public async Task RebuildAuditDocumentClosureAsync([FromServices] IRepository<AuditDocumentClosure> _auditDocumentClosureRepository, [FromServices] IRepository<AuditDocument> _auditDocumentRepository)
+        public async Task<IResponseOutput> RebuildAuditDocumentClosureAsync([FromServices] IRepository<AuditDocumentClosure> _auditDocumentClosureRepository, [FromServices] IRepository<AuditDocument> _auditDocumentRepository)
         {
 
 
@@ -134,6 +134,8 @@ namespace IRaCIS.Core.Application.Service
 
             await _auditDocumentClosureRepository.AddRangeAsync(closures);
             await _auditDocumentClosureRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
         }
 
 

IRaCIS.Core.Domain/Management/User.cs

@@ -69,6 +69,10 @@ public class IdentityUser : BaseFullAuditEntity
     [JsonIgnore]
     public List<TrialIdentityUser> UserTrialList { get; set; }
 
+    [JsonIgnore]
+
+    public List<AuditRecordIdentityUser> AuditRecordList { get; set; }
+
     [JsonIgnore]
     public List<UserRole> UserRoleList { get; set; } = new List<UserRole>();