Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs

@@ -5,6 +5,7 @@ using Magicodes.ExporterAndImporter.Core;
 using MiniExcelLibs.Attributes;
 using Newtonsoft.Json;
 using IRaCIS.Core.Application.Contracts;
+using IRaCIS.Core.Application.Helper;
 
 namespace IRaCIS.Application.Contracts
 {
@@ -17,6 +18,8 @@ namespace IRaCIS.Application.Contracts
         [JsonIgnore]
         public string State => IsDeleted ? "退出" : "加入";
 
+
+        [DictionaryTranslateAttribute("IsUserExitTrial")]
         public bool IsDeleted { get; set; }
 
         [ExcelFormat("yyyy-MM-dd hh:mm:ss")]
@@ -53,14 +56,16 @@ namespace IRaCIS.Application.Contracts
 
     public class TrialMaintenanceDTO : UserTrialCommand
     {
-        [JsonIgnore]
-        public int No { get; set; }
+        //[JsonIgnore]
+        //public int No { get; set; }
         //For MiniExcel  ExcelFormat
         public string State => IsDeleted ? "退出" : "加入";
 
 
         [ValueMapping(text: "退出", true)]
         [ValueMapping(text: "加入", false)]
+
+        [DictionaryTranslateAttribute("IsUserExitTrial")]
         public bool IsDeleted { get; set; }
 
         [ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")]
@@ -135,8 +140,6 @@ namespace IRaCIS.Application.Contracts
     }
     public class SiteUserExportDTO : UserTrialDTO
     {
-        [JsonIgnore]
-        public int No { get; set; }
 
         public string TrialSiteCode { get; set; } = String.Empty;
         public string TrialSiteAliasName { get; set; } = String.Empty;
@@ -151,17 +154,18 @@ namespace IRaCIS.Application.Contracts
 
     public class TrialSiteUserSummaryDto: TrialSiteUserSurveyView
     {
-        [JsonIgnore]
-        public int No { get; set; }
+
 
         public string TrialSiteCode { get; set; } = String.Empty;
         public string TrialSiteAliasName { get; set; } = String.Empty;
 
         public string UserRealName => LastName + " / " + FirstName;
 
-        public string IsGenerateAccountStr => IsGenerateAccount ? "是" : "否";
 
-        public string StateStr => State.GetDescription();
+        //public string IsGenerateAccountStr => IsGenerateAccount ? "是" : "否";
+
+        
+        //public string StateStr => State.GetDescription();
 
     }