From ec042b26498b58bda4dc995d489382fd96bb9884 Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Thu, 11 Jan 2024 13:52:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9BC=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskManagePlat/Dtos/BC/TaskBCShowBaseDto.cs | 5 +++++ .../Service/TaskManagePlat/TaskManageBCService.cs | 11 ++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Myshipping.Application/Service/TaskManagePlat/Dtos/BC/TaskBCShowBaseDto.cs b/Myshipping.Application/Service/TaskManagePlat/Dtos/BC/TaskBCShowBaseDto.cs index f881ac5f..7b8c46e1 100644 --- a/Myshipping.Application/Service/TaskManagePlat/Dtos/BC/TaskBCShowBaseDto.cs +++ b/Myshipping.Application/Service/TaskManagePlat/Dtos/BC/TaskBCShowBaseDto.cs @@ -356,6 +356,11 @@ namespace Myshipping.Application /// 关键信息列表 /// public List Keywords { get; set; } + + /// + /// 任务状态 + /// + public string taskStatus { get; set; } } public class TaskBCShowBaseKeywordDto diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs index 5abcf04e..937cc53c 100644 --- a/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs +++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageBCService.cs @@ -161,6 +161,8 @@ namespace Myshipping.Application if (fileList.Count > 0) model.FileList = fileList.Adapt>(); + model.taskStatus = taskBase.STATUS; + //生成关键信息 #region 生成关键信息 model.Keywords = new List(); @@ -217,6 +219,7 @@ namespace Myshipping.Application } #endregion + #region 获取待处理的BC任务 /// /// 获取待处理的BC任务(来自邮件解析需要对应订舱,系统会根据用户的订舱台账预配) /// @@ -325,7 +328,9 @@ namespace Myshipping.Application return result; } + #endregion + #region 任务ID下载附件 /// /// 任务ID下载附件 /// @@ -364,8 +369,9 @@ namespace Myshipping.Application var result = new FileStreamResult(new FileStream(fileFullPath, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName }; return result; } + #endregion - + #region 检索订舱信息 /// /// 检索订舱信息 /// @@ -478,6 +484,7 @@ namespace Myshipping.Application return result; } + #endregion #region 转移任务(将任务指定给其他人) /// @@ -674,6 +681,7 @@ namespace Myshipping.Application } #endregion + #region 获取服务项目列表 /// /// 获取服务项目列表 /// @@ -685,5 +693,6 @@ namespace Myshipping.Application return await _serviceWorkFlowBaseService.GetEnableProjectList(UserManager.TENANT_ID.ToString()); } + #endregion } }