From 7218427ec291b55fd98c6c6f7a2a1ae675a9ab38 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 6 Mar 2025 11:06:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=82=E4=B8=8E=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=8C=E8=BF=94=E5=9B=9E=E6=8E=88=E6=9D=83=20?= =?UTF-8?q?=E5=92=8C=E7=A6=81=E7=94=A8=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Management/DTO/UserTypeRoleModel.cs | 3 +++ .../Service/TrialSiteUser/TrialMaintenanceService.cs | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs b/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs index 2a37c712e..856c8e7f0 100644 --- a/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs +++ b/IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs @@ -98,6 +98,9 @@ namespace IRaCIS.Core.Application.Contracts public bool IsDeleted { get; set; } public Guid UserTypeId { get; set; } public string UserTypeShortName { get; set; } = string.Empty; + + public DateTime CreateTime { get; set; } + public DateTime UpdateTime { get; set; } } public class UserTypeSimpleDTO diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs index 34f8bf25b..178493ee8 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs @@ -51,12 +51,19 @@ namespace IRaCIS.Core.Application.Service IsDeleted = t.IsDeleted, JoinTime = t.JoinTime, RemoveTime = t.RemoveTime, - TrialUserRoleList = t.TrialUserRoleList.Select(t => new UserTypeSelectDto() { IsDeleted = t.IsDeleted, UserTypeId = t.UserRole.UserTypeRole.Id, UserTypeShortName = t.UserRole.UserTypeRole.UserTypeShortName }).ToList(), + TrialUserRoleList = t.TrialUserRoleList.Select(t => new UserTypeSelectDto() + { + IsDeleted = t.IsDeleted, + UserTypeId = t.UserRole.UserTypeRole.Id, + UserTypeShortName = t.UserRole.UserTypeRole.UserTypeShortName, + CreateTime=t.CreateTime, + UpdateTime=t.UpdateTime, + }).ToList(), }).ToPagedListAsync(inQuery); var info = await _identityUserRepository.Where(t => t.Id == inQuery.IdentityUserId).Select(t => - new { t.CreateTime, t.UserCeateSource, t.Trial.ResearchProgramNo,t.Trial.ExperimentName, t.Trial.TrialCode }).FirstOrDefaultAsync(); + new { t.CreateTime, t.UserCeateSource, t.Trial.ResearchProgramNo, t.Trial.ExperimentName, t.Trial.TrialCode }).FirstOrDefaultAsync(); return ResponseOutput.Ok(list, info); }