修改我的任务台账

Myshipping.Application/Service/TaskManagePlat/Dtos/TaskBaseInfoDto.cs

@@ -160,5 +160,25 @@ namespace Myshipping.Application
         /// </summary>
         public string TenantName { get; set; }
 
+        /// <summary>
+        /// 任务完成方式 MANUAL-手工
+        /// </summary>
+        public string ComplateDeal { get; set; }
+
+        /// <summary>
+        /// 任务完成方式名称 MANUAL-手工
+        /// </summary>
+        public string ComplateDealName { get; set; }
+
+        /// <summary>
+        /// 签单方式（来自订舱）
+        /// </summary>
+        public string IssueType { get; set; }
+
+        /// <summary>
+        /// 签单方式名称（来自订舱）
+        /// </summary>
+        public string IssueTypeName { get; set; }
+
     }
 }

Myshipping.Application/Service/TaskManagePlat/Dtos/TaskManageMapper.cs

@@ -96,13 +96,17 @@ namespace Myshipping.Application
             .Map(dest => dest.CompleteDate, src => src.COMPLETE_DATE)
             .Map(dest => dest.BookOrderNo, src => src.BOOK_ORDER_NO)
             .Map(dest => dest.ResultNote, src => src.RESULT_NOTE)
-            .Map(dest => dest.ETD, src => src.ETD)
+            .Map(dest => dest.ETD, src => src.ETD.HasValue? src.ETD.Value.ToString("yyyy-MM-dd HH:mm:ss"):"")
             .Map(dest => dest.CreatedTime, src => src.CreatedTime)
-            .Map(dest => dest.UpdatedTime, src => src.UpdatedTime)
+            .Map(dest => dest.UpdatedTime, src => src.UpdatedTime.HasValue ? src.UpdatedTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")
             .Map(dest => dest.CreatedUserId, src => src.CreatedUserId)
             .Map(dest => dest.CreatedUserName, src => src.CreatedUserName)
             .Map(dest => dest.UpdatedUserId, src => src.UpdatedUserId)
-            .Map(dest => dest.UpdatedUserName, src => src.UpdatedUserName);
+            .Map(dest => dest.UpdatedUserName, src => src.UpdatedUserName)
+            .Map(dest => dest.ComplateDeal, src => src.COMPLETE_DEAL)
+            .Map(dest => dest.ComplateDealName, src => src.COMPLETE_DEAL_NAME)
+            .Map(dest => dest.IssueType, src => src.ISSUE_TYPE)
+            .Map(dest => dest.IssueTypeName, src => src.ISSUE_TYPE_NAME);
 
             config.ForType<TaskBaseInfoDto, TaskBaseInfo>()
               .Map(dest => dest.PK_ID, src => src.PKId)

Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageService.cs

@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Myshipping.Core;
 using NPOI.POIFS.Crypt.Dsig;
 using NPOI.SS.Formula.Functions;
 using SqlSugar;
@@ -42,7 +43,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="QuerySearch">任务台账查询请求</param>
         /// <returns>返回结果</returns>
-        Task<dynamic> GetPageAsync(QueryTaskManageDto QuerySearch);
+        Task<SqlSugarPagedList<TaskBaseInfoDto>> GetPageAsync(QueryTaskManageDto QuerySearch);
 
 
         /// <summary>

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -613,7 +613,7 @@ namespace Myshipping.Application
         /// <param name="QuerySearch">任务台账查询请求</param>
         /// <returns>返回结果</returns>
         [HttpPost("/TaskManage/GetPage")]
-        public async Task<dynamic> GetPageAsync(QueryTaskManageDto QuerySearch)
+        public async Task<SqlSugarPagedList<TaskBaseInfoDto>> GetPageAsync(QueryTaskManageDto QuerySearch)
         {
             List<string> mblList = new List<string>();