修改参与人员导表

2025-01-08 13:22:24 +08:00
parent 86c871bc9f
commit 8111b60d4f
3 changed files with 23 additions and 18 deletions
@@ -80,7 +80,24 @@ namespace IRaCIS.Core.Application.Service.Common
                    t => t.UserRole.OrganizationName.Contains(param.OrganizationName))
                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName),
                    t => (t.UserRole.FullName).Contains(param.UserRealName))
-                .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
+                .Select(t=>new TrialMaintenanceDTO()
+                {
+                    UserRealName=t.UserRole.IdentityUser.FullName,
+                    UserName=t.UserRole.IdentityUser.UserName,
+                    UserType=t.UserRole.UserTypeRole.UserTypeShortName,
+                    Phone=t.UserRole.IdentityUser.Phone,
+                    EMail=t.UserRole.IdentityUser.EMail,    
+                    OrganizationName= t.UserRole.IdentityUser.OrganizationName,
+
+                    IsDeleted=t.TrialUser.IsDeleted,
+                    JoinTime=t.TrialUser.JoinTime,
+                    RemoveTime=t.TrialUser.RemoveTime,
+
+                    //角色授权禁用时间
+                    CreateTime=t.CreateTime,
+                    DeletedTime=t.DeletedTime,
+                }).OrderBy(t=>t.UserRealName)
+                .ToListAsync();

            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
            exportInfo.CurrentTime = ExportExcelConverterDate.DateTimeInternationalToString(DateTime.Now, _userInfo.TimeZoneId);