修改查询条件

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

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<TrialSiteUserSurveyAllDTO>(_mapper.ConfigurationProvider);
 

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<UserEmail> SendUsers { get; set; } = new List<UserEmail>();

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;
 

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<IResponseOutput> 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相关工作，欢迎您提供指导和建议，非常感谢！
                                           </div>
                                          
-                                          <a href='  {sendEmail.RouteUrl + "?Id=" + userInfo.Id + "&IsExternalUser=1"}' style='margin-left:60px;font-size:14px;text-decoration: none;display: inline-block;height: 40px;width: 140px;background: #00D1B2;color:#fff;border-radius: 5px;line-height: 40px;text-align: center;margin-bottom: 100px;'>
+                                       <form action='#' method='post'>
-                                            查看并确认
+                                          <button type='submit' style='margin-left:60px;font-size:14px;text-decoration: none;display: inline-block;height: 40px;width: 140px;background: #00D1B2;color:#fff;border-radius: 5px;line-height: 40px;text-align: center;border:none;margin-bottom: 100px;cursor: pointer'>查看并确认</button>
-                                          </a>      
+                                       </form>    
                                         </div>
                                       </div>
                                     </body>";