From aba0101b01466fb6d6674ee5b25139d4163ca7ca Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 12 Nov 2024 14:05:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E8=A1=A8=E9=87=8C=E7=9A=84?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=20=20=E6=8A=8A=E6=97=B6=E9=97=B4=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs | 7 ++++++- .../Service/TrialSiteUser/DTO/UserTrialViewModel.cs | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) 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")]