From ee78cec185b5e99e7face4423820f7d924f4cade Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Fri, 7 Jun 2024 18:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9VGM=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8F=B0=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Interface/ITaskManageVGMService.cs        |  2 +-
 .../TaskManagePlat/TaskManageVGMService.cs    | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageVGMService.cs b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageVGMService.cs
index 68b3d6f4..dbc577d1 100644
--- a/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageVGMService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/Interface/ITaskManageVGMService.cs
@@ -40,7 +40,7 @@ namespace Myshipping.Application.Service.TaskManagePlat.Interface
         Task<List<TaskVGMShowDto>> GetVGMMissingInfoByTaskId(string taskPkId);
 
         /// <summary>
-        /// 
+        /// 发送VGM未提交通知（钉钉消息、邮件通知）
         /// </summary>
         /// <param name="taskPkId"></param>
         /// <returns></returns>
diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageVGMService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageVGMService.cs
index f2a1afb0..08674c84 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskManageVGMService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageVGMService.cs
@@ -2,6 +2,7 @@
 using Furion.FriendlyException;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging.Abstractions;
 using Myshipping.Application.Entity;
 using Myshipping.Application.Service.TaskManagePlat.Interface;
 using Myshipping.Core;
@@ -40,7 +41,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="pkId">BC主键</param>
         /// <returns>返回回执</returns>
-        [HttpGet("/BookingMSKAPI/GetVGMSubmissionInfo")]
+        [HttpGet("/TaskManageVGM/GetVGMSubmissionInfo")]
         public async Task<List<TaskVGMShowDto>> GetVGMSubmissionInfo(string pkId)
         {
             List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
@@ -78,7 +79,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="taskPkId">VGM任务主键</param>
         /// <returns>返回回执</returns>
-        [HttpGet("/BookingMSKAPI/GetVGMSubmissionInfoByTaskId")]
+        [HttpGet("/TaskManageVGM/GetVGMSubmissionInfoByTaskId")]
         public async Task<List<TaskVGMShowDto>> GetVGMSubmissionInfoByTaskId(string taskPkId)
         {
             List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
@@ -121,7 +122,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="pkId">BC主键</param>
         /// <returns>返回回执</returns>
-        [HttpGet("/BookingMSKAPI/GetVGMMissingInfo")]
+        [HttpGet("/TaskManageVGM/GetVGMMissingInfo")]
         public async Task<List<TaskVGMShowDto>> GetVGMMissingInfo(string pkId)
         {
             List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
@@ -134,7 +135,7 @@ namespace Myshipping.Application
             var CtnList = _taskVGMCtnInfoRepository.AsQueryable()
                 .Where(a => a.P_ID == pkId).ToList();
 
-            if (CtnList.Count == 0)
+            if (CtnList.Count > 0)
             {
                 list = CtnList.OrderBy(p => p.P_ID).ThenBy(p => p.CNTRNO).Select(p =>
                 {
@@ -159,7 +160,7 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="taskPkId">VGM任务主键</param>
         /// <returns>返回回执</returns>
-        [HttpGet("/BookingMSKAPI/GetVGMMissingInfoByTaskId")]
+        [HttpGet("/TaskManageVGM/GetVGMMissingInfoByTaskId")]
         public async Task<List<TaskVGMShowDto>> GetVGMMissingInfoByTaskId(string taskPkId)
         {
             List<TaskVGMShowDto> list = new List<TaskVGMShowDto>();
@@ -200,5 +201,16 @@ namespace Myshipping.Application
             return list;
         }
         #endregion
+
+        /// <summary>
+        /// 发送VGM未提交通知（钉钉消息、邮件通知）
+        /// </summary>
+        /// <param name="taskPkId"></param>
+        /// <returns></returns>
+        [HttpGet("/TaskManageVGM/SendVGMMissingNotice")]
+        public async Task<TaskManageOrderResultDto> SendVGMMissingNotice(string taskPkId)
+        {
+            return null;
+        }
     }
 }