diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 340dfaf8d..6f5393bca 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -231,6 +231,9 @@ namespace IRaCIS.Core.Application.Contracts public DateTime? EarliestScanDate { get; set; } public DateTime? LatestScanDate { get; set; } + public string EarliestScanDateStr => EarliestScanDate?.ToString("yyyy-MM-dd") ?? string.Empty; + public string LatestScanDateStr => LatestScanDate?.ToString("yyyy-MM-dd") ?? string.Empty; + public DateTime? SubmitTime { get; set; } @@ -293,7 +296,7 @@ namespace IRaCIS.Core.Application.Contracts public string LatestReplyUserName { get; set; } = String.Empty; public string Content { get; set; } = string.Empty; - public string ContentReplaced => Content.Replace("
","").Replace("
", "").Replace("
", "").Replace("
",""); + public string ContentReplaced => Content.Replace("
", "").Replace("
", "").Replace("
", "").Replace("
", ""); [DictionaryTranslateAttribute("ChallengeIsClosed")] public bool IsClosed { get; set; } @@ -740,6 +743,8 @@ namespace IRaCIS.Core.Application.Contracts public DateTime? LatestScanDate { get; set; } + public string LatestScanDateStr => LatestScanDate?.ToString("yyyy-MM-dd") ?? string.Empty; + public List ModalityList { get; set; } public string Modalitys => string.Join(',', ModalityList); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs index ccb1ea11b..53d4b2376 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs @@ -88,11 +88,14 @@ namespace IRaCIS.Application.Contracts [ExcelFormat("yyyy-MM-dd")] public DateTime? RemoveTime { get; set; } + public string RemoveTimeStr=> RemoveTime?.ToString("yyyy-MM-dd") ?? string.Empty; + //[ExporterHeader(Format = "yyyy-mm-DD")] [ExcelFormat("yyyy-MM-dd")] public DateTime? JoinTime { get; set; } + public string JoinTimeStr => JoinTime?.ToString("yyyy-MM-dd") ?? string.Empty; //[ExporterHeader(Format = "yyyy-mm-DD hh:mm:ss")] [ExcelFormat("yyyy-MM-dd HH:mm:ss")]