From d59cc41381d43934572921cc1d694af6f78e39aa Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Fri, 4 Aug 2023 16:03:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=92=8C=E5=8F=96=E6=B6=88=E7=8A=B6=E6=80=81=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BookingOrder/BookingValueAddedService.cs  |  8 +++++--
 .../Dto/ModifyServiceProjectDto.cs            | 22 +++++++++++++++++--
 .../Dtos/TrackingMessageInfo.cs               |  2 +-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Myshipping.Application/Service/BookingOrder/BookingValueAddedService.cs b/Myshipping.Application/Service/BookingOrder/BookingValueAddedService.cs
index b7028c52..fb291819 100644
--- a/Myshipping.Application/Service/BookingOrder/BookingValueAddedService.cs
+++ b/Myshipping.Application/Service/BookingOrder/BookingValueAddedService.cs
@@ -2279,7 +2279,9 @@ namespace Myshipping.Application
                         SourceType = TrackingSourceTypeEnum.MANUAL,
                         StatusList = model.StatusCodes.Select(a => new TrackingMessageMainStatusInfo
                         {
-                            StatusCode = a,
+                            StatusCode = a.StatusCode,
+                            StatusDate = a.SetActDate,
+                            StatusVal = a.SetActVal
                         }).ToList()
                     }
                 };
@@ -2368,7 +2370,9 @@ namespace Myshipping.Application
                         SourceType = TrackingSourceTypeEnum.MANUAL,
                         StatusList = model.StatusCodes.Select(a => new TrackingMessageMainStatusInfo
                         {
-                            StatusCode = a,
+                            StatusCode = a.StatusCode,
+                            StatusDate = a.SetActDate,
+                            StatusVal = a.SetActVal
                         }).ToList()
                     }
                 };
diff --git a/Myshipping.Application/Service/BookingOrder/Dto/ModifyServiceProjectDto.cs b/Myshipping.Application/Service/BookingOrder/Dto/ModifyServiceProjectDto.cs
index 5e3b284d..243a538b 100644
--- a/Myshipping.Application/Service/BookingOrder/Dto/ModifyServiceProjectDto.cs
+++ b/Myshipping.Application/Service/BookingOrder/Dto/ModifyServiceProjectDto.cs
@@ -33,8 +33,26 @@ namespace Myshipping.Application
         public long BookingId { get; set; }
 
         /// <summary>
-        /// 服务项目状态代码
+        /// 服务项目状态明细
         /// </summary>
-        public string[] StatusCodes { get; set; }
+        public List<ModifyServiceProjectStatusDetailDto> StatusCodes { get; set; }
+    }
+
+    public class ModifyServiceProjectStatusDetailDto
+    {
+        /// <summary>
+        /// 状态代码
+        /// </summary>
+        public string StatusCode { get; set; }
+
+        /// <summary>
+        /// 人工设定状态完成时间
+        /// </summary>
+        public Nullable<DateTime> SetActDate { get; set; }
+
+        /// <summary>
+        /// 人工设定状态值（可传箱使天数）
+        /// </summary>
+        public string SetActVal { get; set; }
     }
 }
diff --git a/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingMessageInfo.cs b/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingMessageInfo.cs
index 15bcd3d5..22351c2e 100644
--- a/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingMessageInfo.cs
+++ b/Myshipping.Application/Service/TrackingSystem/Dtos/TrackingMessageInfo.cs
@@ -202,7 +202,7 @@ namespace Myshipping.Application
         /// <summary>
         /// 状态产生时间
         /// </summary>
-        public DateTime StatusDate { get; set; }
+        public Nullable<DateTime> StatusDate { get; set; }
 
         /// <summary>
         /// 状态产生值