XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-03-06 13:12:10 +08:00
parent 153dbd2016 91d5cbce16
commit 8b3040c24d
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Management/DTO/UserTypeRoleModel.cs
View File

@ -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

11
IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
View File

@ -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);
}