修改上传和归档

This commit is contained in:
2023-03-02 12:34:02 +08:00
parent 271fa2bccc
commit 7cbede4507
10 changed files with 66 additions and 43 deletions
@@ -385,7 +385,6 @@ namespace IRaCIS.Core.Application.Service.Common
UploadFinishedTime = t.UploadFinishedTime,
TotalMillisecondsInterval = t.TotalMillisecondsInterval,
UploadTime = t.CreateTime,
@@ -59,7 +59,26 @@ namespace IRaCIS.Core.Application.Contracts
public string ArchiveFinishedTimeStr => ArchiveFinishedTime?.ToString("yyyy-MM-dd HH:mm:ss.fff");
public double TotalMillisecondsInterval { get; set; }
public string UploadIntervalStr
{
get
{
var uploadTimeSpan = UploadFinishedTime - UploadStartTime;
return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
}
}
public string ArchiveIntervalStr
{
get
{
var uploadTimeSpan = ArchiveFinishedTime - UploadFinishedTime;
return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
}
}
public string TimeInterval
@@ -67,9 +86,11 @@ namespace IRaCIS.Core.Application.Contracts
get
{
var uploadTimeSpan = UploadFinishedTime - UploadStartTime;
var uploadTimeSpan = ArchiveFinishedTime - UploadStartTime;
return $" {uploadTimeSpan.Hours}:{uploadTimeSpan.Minutes}:{uploadTimeSpan.Seconds}.{uploadTimeSpan.Milliseconds}";
return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
#region
//if (uploadTimeSpan.Seconds == 0 && uploadTimeSpan.Minutes==0 && uploadTimeSpan.Hours == 0)
//{
// return $"{uploadTimeSpan.Milliseconds}毫秒";
@@ -86,6 +107,8 @@ namespace IRaCIS.Core.Application.Contracts
//{
// return $" {uploadTimeSpan.Hours} 小时 {uploadTimeSpan.Minutes} 分钟 {uploadTimeSpan.Seconds} 秒 {uploadTimeSpan.Milliseconds}毫秒";
//}
#endregion
}
}
@@ -192,7 +192,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
TotalMillisecondsInterval = t.TotalMillisecondsInterval,
IsDicomReUpload = t.IsDicomReUpload,
StudyId = t.Id,
@@ -473,10 +473,9 @@ namespace IRaCIS.Core.Application.Contracts
public string IsDicomStr => IsDicom ? "DICOM" : "Non-DICOM";
public string UploadStartTimeStr => UploadStartTime.ToString("yyyy-MM-dd HH:mm:ss.fff");
public string UploadFinishedTimeStr => UploadFinishedTime.ToString("yyyy-MM-dd HH:mm:ss.fff");
public string UploadFinishedTimeStr => UploadFinishedTime?.ToString("yyyy-MM-dd HH:mm:ss.fff");
public double TotalMillisecondsInterval { get; set; }
public string TimeInterval
@@ -486,14 +485,14 @@ namespace IRaCIS.Core.Application.Contracts
var uploadTimeSpan = UploadFinishedTime - UploadStartTime;
return $" {uploadTimeSpan.Hours}:{uploadTimeSpan.Minutes}:{uploadTimeSpan.Seconds}.{uploadTimeSpan.Milliseconds}";
return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
}
}
public DateTime UploadStartTime { get; set; }
public DateTime UploadFinishedTime { get; set; }
public DateTime? UploadFinishedTime { get; set; }
public decimal FileSize { get; set; }