迁移Study 中心调研修改

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteSurveyViewModel.cs

@@ -84,7 +84,6 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         public bool? IsGenerateAccount { get; set; }
-        public Guid? TrialRoleNameId { get; set; }
 
         public TrialSiteUserStateEnum? State { get; set; }
 
@@ -168,6 +167,29 @@ namespace IRaCIS.Core.Application.Contracts
 
 
 
+    }
+
+    public class TrialSiteSurveySelectView
+    {
+        public Guid Id { get; set; }
+        public TrialSiteSurveyEnum State { get; set; }
+        public DateTime CreateTime { get; set; }
+        public bool IsDeleted { get; set; }
+
+        public string Phone { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+
+        public string UserName { get; set; } = string.Empty;
+
+    }
+
+    public class TrialSiteSurveySelectquery
+    {
+        public Guid TrialId { get; set; }
+
+        public Guid SiteId { get; set; }
+
+        public Guid TrialSiteSurveyId { get; set; }
     }
 
     ///<summary>TrialSiteSurveyQuery  列表查询参数模型</summary>
@@ -221,7 +243,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string Email { get; set; } = string.Empty;
 
         [NotDefault]
-        public  Guid TrialId { get; set; }
+        public Guid TrialId { get; set; }
 
     }
 
@@ -324,7 +346,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string UserKeyInfo { get; set; } = string.Empty;
 
-      
+
 
         public TrialSiteSurveyEnum? State { get; set; }
 

IRaCIS.Core.Application/Service/SiteSurvey/DTO/TrialSiteUserSurveyViewModel.cs

@@ -5,19 +5,21 @@
 //--------------------------------------------------------------------
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Domain.Share;
+using MiniExcelLibs.Attributes;
 using Newtonsoft.Json;
+using System.ComponentModel.DataAnnotations;
 
 namespace IRaCIS.Core.Application.Contracts
 {
     /// <summary> TrialSiteUserSurveyView  列表视图模型 </summary>
-    public class TrialSiteUserSurveyView: TrialSiteUserSurveyAddOrEdit
+    public class TrialSiteUserSurveyView : TrialSiteUserSurveyAddOrEdit
     {
         public bool IsGenerateSuccess { get; set; }
         public DateTime CreateTime { get; set; }
         public Guid CreateUserId { get; set; }
         public DateTime UpdateTime { get; set; }
         public Guid UpdateUserId { get; set; }
-       
+
         public string UserType { get; set; } = string.Empty;
 
         [JsonIgnore]
@@ -48,14 +50,18 @@ namespace IRaCIS.Core.Application.Contracts
             }
         }
 
-        public string TrialRoleName { get; set; }
 
-        public string TrialRoleCode { get; set; }
 
         public UserTypeEnum? UserTypeEnum { get; set; }
 
         public Guid? SystemUserId { get; set; }
 
+
+
+
+        public bool? IsHistoryUserOriginDeleted { get; set; }
+
+
     }
 
 
@@ -88,7 +94,7 @@ namespace IRaCIS.Core.Application.Contracts
     public class TrialSiteUserSurveyAddOrEdit
     {
         public Guid? Id { get; set; }
-      
+
         public Guid TrialSiteSurveyId { get; set; }
         public Guid? UserTypeId { get; set; }
         public string FirstName { get; set; } = string.Empty;
@@ -98,11 +104,20 @@ namespace IRaCIS.Core.Application.Contracts
 
         [DictionaryTranslateAttribute("YesOrNo")]
         public bool IsGenerateAccount { get; set; }
-        public Guid TrialRoleNameId { get; set; }
+        public int TrialRoleCode { get; set; }
 
         public string OrganizationName { get; set; } = string.Empty;
+
+        public bool IsHistoryUser { get; set; }
+        public bool? IsHistoryUserDeleted { get; set; }
     }
 
+    public class TrialSiteUserSurverQuery
+    {
+        public Guid TrialSiteSurveyId { get; set; }
+
+        public bool? IsHistoryUser { get; set; }
+    }
 
     public class TrialSiteUserSurveyVerfyResult
     {
@@ -111,6 +126,44 @@ namespace IRaCIS.Core.Application.Contracts
         public List<string> ErroMsgList { get; set; } = new List<string>();
     }
 
+    public class SiteSurveyUserImportUploadDto
+    {
+        [NotDefault]
+        public Guid TrialId { get; set; }
+
+        public string BaseUrl { get; set; }
+        public string RouteUrl { get; set; }
+    }
+
+    public class SiteSurveyUserImportDto
+    {
+        public string TrialSiteCode { get; set; } = string.Empty;
+        public string FirstName { get; set; } = string.Empty;
+        public string LastName { get; set; } = string.Empty;
+        public string Email { get; set; } = string.Empty;
+        public string Phone { get; set; } = string.Empty;
+        public string OrganizationName { get; set; } = string.Empty;
+
+        [ExcelColumnName("UserType")]
+        public string UserTypeStr { get; set; }
+
+        [JsonIgnore]
+        public Guid SiteId { get; set; }
+
+        [JsonIgnore]
+        public UserTypeEnum UserTypeEnum { get; set; } = UserTypeEnum.Undefined;
+
+
+        [JsonIgnore]
+        public Guid UserTypeId { get; set; }
+
+
+        [JsonIgnore]
+        public bool IsGeneratedAccount { get; set; }
+        [JsonIgnore]
+        public bool IsJoinedTrial { get; set; }
+    }
+
 }