diff --git a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs index 61d9c46e7..7ba1c8b01 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs @@ -108,21 +108,24 @@ namespace IRaCIS.Core.Application.Contracts public int AttachmentCount { get; set; } - public DateTime? SuggestFinishTime { get { + public DateTime? SuggestFinishTime + { + get + { if (this.CreateTime > this.UserCreateTime && this.CurrentStaffTrainDays != null) { - return this.CreateTime.AddDays(this.CurrentStaffTrainDays.Value); + return DateTime.Parse(this.CreateTime.AddDays(this.CurrentStaffTrainDays.Value).ToString("yyyy-MM-dd")+" 22:00:00"); } if (this.CreateTime < this.UserCreateTime && this.NewStaffTrainDays != null) { - return this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value); + return DateTime.Parse(this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value).ToString("yyyy-MM-dd") + " 22:00:00"); } - return null; - - } } + + } + } public string DocTypeCode { get; set; }