From 8c743f5b7b1be0ef0d94306427eee0fb46cff99b Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 2 Mar 2023 16:16:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Common/ExcelExportService.cs      |  2 ++
 .../Service/QC/DTO/QCListViewModel.cs         | 26 ++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
index 2bd0d10b8..94470861c 100644
--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@@ -385,6 +385,8 @@ namespace IRaCIS.Core.Application.Service.Common
 
                      UploadFinishedTime = t.UploadFinishedTime,
 
+                     ArchiveFinishedTime=t.ArchiveFinishedTime,
+
 
                      UploadTime = t.CreateTime,
 
diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
index b51509a00..cea16a571 100644
--- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
+++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
@@ -475,7 +475,27 @@ namespace IRaCIS.Core.Application.Contracts
         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 ArchiveFinishedTimeStr => ArchiveFinishedTime?.ToString("yyyy-MM-dd HH:mm:ss.fff");
 
+        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
@@ -483,7 +503,7 @@ namespace IRaCIS.Core.Application.Contracts
             get
             {
 
-                var uploadTimeSpan = UploadFinishedTime - UploadStartTime;
+                var uploadTimeSpan = ArchiveFinishedTime - UploadStartTime;
 
                 return $" {uploadTimeSpan?.Hours}:{uploadTimeSpan?.Minutes}:{uploadTimeSpan?.Seconds}.{uploadTimeSpan?.Milliseconds}";
             }
@@ -491,7 +511,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         public DateTime UploadStartTime { get; set; }
 
-
+        public DateTime? ArchiveFinishedTime { get; set; }
         public DateTime? UploadFinishedTime { get; set; }
 
 
@@ -508,7 +528,7 @@ namespace IRaCIS.Core.Application.Contracts
         public int FileCount { get; set; }
 
         [DictionaryTranslateAttribute("YesOrNo")]
-        public bool IsSuccess { get; set; } = true;
+        public bool IsSuccess { get; set; } 
 
         public string Note = string.Empty;