From 0c6be16987ff71496588e9aaa2b91b0a7c3e3acf Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 31 Mar 2022 18:07:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs | 8 +++++++- .../Service/SiteSurvey/TrialSiteSurveyService.cs | 3 ++- .../TrialSiteUser/DTO/TrialExternalUserViewModel.cs | 2 ++ .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs | 6 +++++- .../Service/TrialSiteUser/TrialExternalUserService.cs | 10 +++------- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs index c75dc068..0019dffc 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs @@ -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; } diff --git a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs index 78cad604..33825428 100644 --- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs +++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs @@ -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(_mapper.ConfigurationProvider); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs index ffebce3a..7fb52c01 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs @@ -137,6 +137,8 @@ namespace IRaCIS.Core.Application.ViewModel [NotDefault] public Guid TrialId { get; set; } + public string BaseUrl { get; set; } = string.Empty; + public string RouteUrl { get; set; } = string.Empty; public List SendUsers { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index 07e6e42a..b3569b66 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -16,7 +16,11 @@ namespace IRaCIS.Application.Contracts public DateTime? RemoveTime { get; set; } public Guid? SiteId { get; set; } public string Phone { get; set; } = String.Empty; - public DateTime? UpdateTime { get; set; } + public DateTime UpdateTime { get; set; } + + public DateTime CreateTime { get; set; } + + public string UserType { get; set; } = String.Empty; public string UserRealName { get; set; } = String.Empty; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs index 116f8863..a632e7bd 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs @@ -4,11 +4,9 @@ // 对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。 //-------------------------------------------------------------------- -using IRaCIS.Core.Domain.Models; using Microsoft.AspNetCore.Mvc; using IRaCIS.Core.Application.Interfaces; using IRaCIS.Core.Application.ViewModel; -using IRaCIS.Core.Infra.EFCore; using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Domain.Share; using MimeKit; @@ -64,8 +62,6 @@ namespace IRaCIS.Core.Application.Service public async Task AddOrUpdateTrialExternalUser(TrialExternalUserAddOrEdit addOrEditTrialExternalUser) { - - if (addOrEditTrialExternalUser.Id == null) { var existSysUser = await _userRepository.FirstOrDefaultAsync(t => t.EMail == addOrEditTrialExternalUser.Email && t.UserTypeId == addOrEditTrialExternalUser.UserTypeId); @@ -245,9 +241,9 @@ namespace IRaCIS.Core.Application.Service 您好，展影医疗作为 实验方案号：{trialInfo.ResearchProgramNo} 项目的IRC供应商，诚邀您参加该项目IRC相关工作，欢迎您提供指导和建议，非常感谢！ - - 查看并确认 - +
+ +
";