From fd83c3e7a75f76428494aad7321bc7239561347f Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 14 Apr 2025 14:10:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Document/DTO/SystemDocumentViewModel.cs       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

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; }
 

From a8a9a09f88f1e0a773b108b008c949a28bb5fc88 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 14 Apr 2025 14:11:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Document/DTO/SystemDocumentViewModel.cs              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
index 7ba1c8b01..3c981468a 100644
--- a/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs
@@ -122,6 +122,7 @@ namespace IRaCIS.Core.Application.Contracts
                 {
                     return DateTime.Parse(this.UserCreateTime.AddDays(this.NewStaffTrainDays.Value).ToString("yyyy-MM-dd") + " 22:00:00");
                 }
+
                 return null;
 
             }