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

Merge branch 'Uat_IRC_Net8' into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
hang 2025-02-14 16:15:37 +08:00
parent 655fe18138 580eea7a61
commit b58bdc184e
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -472,7 +472,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// </summary> /// </summary>
public string OpByUserName { get; set; } = string.Empty; public string OpByUserName { get; set; } = string.Empty;
public string? CreateUserName { get; set; } public string? CreateUserRealName { get; set; }
/// <summary> /// <summary>
/// 阅读片人 /// 阅读片人

2
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -198,7 +198,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
.WhereIf(inQuery.ModuleType != null, x => x.ModuleTypeId == inQuery.ModuleType) .WhereIf(inQuery.ModuleType != null, x => x.ModuleTypeId == inQuery.ModuleType)
.WhereIf(!inQuery.Description.IsNullOrEmpty(), x => x.Description.Contains(inQuery.Description) || x.DescriptionCN.Contains(inQuery.Description)) .WhereIf(!inQuery.Description.IsNullOrEmpty(), x => x.Description.Contains(inQuery.Description) || x.DescriptionCN.Contains(inQuery.Description))
.WhereIf(!inQuery.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.OpByUserName)) .WhereIf(!inQuery.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.OpByUserName))
.WhereIf(!inQuery.CreateUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.CreateUserName) || x.CreateUserRealName.Contains(inQuery.CreateUserName)) .WhereIf(!inQuery.CreateUserRealName.IsNullOrEmpty(), x => x.CreateUserName.Contains(inQuery.CreateUserRealName) || x.CreateUserRealName.Contains(inQuery.CreateUserRealName))
//.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo)) //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
.WhereIf(inQuery.IsSign != null, x => x.IsSign == inQuery.IsSign); .WhereIf(inQuery.IsSign != null, x => x.IsSign == inQuery.IsSign);

9
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
View File

@ -94,6 +94,15 @@ namespace IRaCIS.Application.Contracts
public Guid UserId { get; set; } public Guid UserId { get; set; }
} }
public class TrialIdentityUserBasicInfo
{
public Guid IdentityUserId { get; set; }
public string UserName { get; set; }
public string FullName { get; set; }
}
public class TrialMaintenanceDTO : UserTrialCommand public class TrialMaintenanceDTO : UserTrialCommand
{ {

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

@ -21,10 +21,10 @@ namespace IRaCIS.Core.Application.Service
{ {
[HttpGet] [HttpGet]
public async Task<List<TrialUserBasicInfo>> GetTrialUserList(Guid trialId) public async Task<List<TrialIdentityUserBasicInfo>> GetTrialUserList(Guid trialId)
{ {
return await _trialUseRoleRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true) return await _trialIdentityUserRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
.Select(t => new TrialUserBasicInfo() { FullName = t.UserRole.FullName, UserId = t.UserId, UserTypeId = t.UserRole.UserTypeId, UserName = t.UserRole.IdentityUser.UserName }) .Select(t => new TrialIdentityUserBasicInfo() { FullName = t.IdentityUser.FullName, IdentityUserId = t.IdentityUserId, UserName = t.IdentityUser.UserName })
.ToListAsync(); .ToListAsync();
} }