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

修改查询
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-05-14 15:01:18 +08:00
parent 329437411d
commit 3bf26dbbef
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,6 +509,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public Guid? TrialReadingCriterionId { get; set; }
public string? TaskName { get; set; }
}
public class InspectionBase

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

@ -183,8 +183,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
.WhereIf(dto.BatchId != null, x => x.BatchId == dto.BatchId)
.WhereIf(dto.BatchId == null && dto.GeneralId != null, x => x.GeneralId == dto.GeneralId)
.WhereIf(dto.TrialReadingCriterionId != null, x => x.TrialReadingCriterionId == dto.TrialReadingCriterionId)
.WhereIf(!dto.TaskName.IsNullOrEmpty(), x => x.TaskName.Contains(dto.TaskName) || x.BlindName.Contains(dto.TaskName))
.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))
.WhereIf(!dto.RoleName.IsNullOrEmpty(), x => x.RoleName.Contains(dto.RoleName))
//.WhereIf(dto.VisitPlanInfo != null&& dto.VisitPlanInfo!=(decimal) 1.11, x => x.VisitNum == dto.VisitPlanInfo)

1
IRaCIS.Core.Application/Service/Management/DTO/UserLogViewModel.cs
View File

@ -57,6 +57,7 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid? UserTypeId { get; set; }
public Guid? UserId { get; set; }
}

1
IRaCIS.Core.Application/Service/Management/UserService.cs
View File

@ -761,6 +761,7 @@ namespace IRaCIS.Application.Services
_userLogRepository
.WhereIf(inQuery.TrialId != null, t => t.LoginUser.UserTrials.Any(c => c.TrialId == inQuery.TrialId && (c.UserId == t.LoginUserId || c.UserId == t.OptUserId)))
.WhereIf(inQuery.OptType != null, t => t.OptType == inQuery.OptType)
.WhereIf(inQuery.UserId != null, t => t.LoginUserId == inQuery.UserId)
.WhereIf(inQuery.BeginDate != null, t => t.CreateTime >= inQuery.BeginDate)
.WhereIf(inQuery.EndDate != null, t => t.CreateTime <= inQuery.EndDate)
.WhereIf(!string.IsNullOrEmpty(inQuery.LoginUserName), t => t.LoginUser.UserName.Contains(inQuery.LoginUserName!))