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

修改查询条件

Browse Source
This commit is contained in:
hang
2022-03-31 18:07:29 +08:00
parent 369fbc6d2c
commit 0c6be16987
5 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs
+7 -1
View File
@@ -78,7 +78,11 @@ namespace IRaCIS.Core.Application.Contracts
public string FormWriterKeyInfo { get; set; } = string.Empty;
public string UserKeyInfo { get; set; } = string.Empty;
//public string UserKeyInfo { get; set; } = string.Empty;
public string UserName { get; set; } = string.Empty;
public string OrganizationName { get; set; } = string.Empty;
}
@@ -247,6 +251,8 @@ namespace IRaCIS.Core.Application.Contracts
public string UserKeyInfo { get; set; } = string.Empty;
public TrialSiteSurveyEnum? State { get; set; }
public bool? IsAbandon { get; set; }
IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+2 -1
View File
@@ -401,7 +401,8 @@ namespace IRaCIS.Core.Application.Contracts
.WhereIf(queryParam.TrialRoleNameId != null, t => t.TrialRoleNameId == queryParam.TrialRoleNameId)
.WhereIf(queryParam.State != null && queryParam.State != TrialSiteUserStateEnum.OverTime, t => t.InviteState == queryParam.State)
.WhereIf(queryParam.State != null && queryParam.State == TrialSiteUserStateEnum.OverTime, t => t.InviteState == TrialSiteUserStateEnum.HasSend && t.ExpireTime < DateTime.Now)
.WhereIf(!string.IsNullOrEmpty(queryParam.UserKeyInfo), t => (t.LastName + " / " + t.FirstName).Contains(queryParam.UserKeyInfo) || t.Email.Contains(queryParam.UserKeyInfo) || t.Phone.Contains(queryParam.UserKeyInfo))
.WhereIf(!string.IsNullOrEmpty(queryParam.UserName), t => (t.LastName + " / " + t.FirstName).Contains(queryParam.UserName) )
.WhereIf(!string.IsNullOrEmpty(queryParam.OrganizationName), t => t.OrganizationName.Contains(queryParam.OrganizationName))
.ProjectTo<TrialSiteUserSurveyAllDTO>(_mapper.ConfigurationProvider);