From ebde67bf9e4f78f6f83eb346cc7900544fdbae81 Mon Sep 17 00:00:00 2001
From: jianghaiqing <jianghaiqing@myshipping.com>
Date: Fri, 7 Jul 2023 14:09:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskManagePlat/TaskManageService.cs       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
index effaf77c..3870f8d8 100644
--- a/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
+++ b/Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs
@@ -1426,7 +1426,7 @@ namespace Myshipping.Application
         {
             TaskManageOrderResultDto result = new TaskManageOrderResultDto();
 
-            List<Task<TaskManageOrderResultDto>> taskRunList = new List<Task<TaskManageOrderResultDto>>();
+            List<TaskManageOrderResultDto> taskRunList = new List<TaskManageOrderResultDto>();
 
             string batchNo = IDGen.NextID().ToString();
 
@@ -1443,15 +1443,15 @@ namespace Myshipping.Application
                 foreach (var bk in taskList)
                 {
                     var sortNo = noList.FirstOrDefault(a => a.id == bk.PK_ID).no;
-                    taskRunList.Add(Task.Run(() => InnerManualTask(batchNo,bk, TaskOperTypeEnum.COMPLETE_TASK, sortNo)));
+                    taskRunList.Add(InnerManualTask(batchNo,bk, TaskOperTypeEnum.COMPLETE_TASK, sortNo).GetAwaiter().GetResult());
                 }
 
-                Task.WaitAll(taskRunList.ToArray());
+                //Task.WaitAll(taskRunList.ToArray());
 
                 result.succ = true;
                 result.msg = "执行成功";
 
-                var downResultList = taskRunList.Select(x => x.Result).ToList();
+                var downResultList = taskRunList.Select(x => x).ToList();
 
                 if (downResultList.Any(x => !x.succ))
                 {
@@ -1585,7 +1585,7 @@ namespace Myshipping.Application
                         model.UpdatedUserId = UserManager.UserId;
                         model.UpdatedUserName = UserManager.Name;
 
-                       await _taskBaseInfoRepository.AsUpdateable(model).UpdateColumns(it => new
+                        await _taskBaseInfoRepository.AsUpdateable(model).UpdateColumns(it => new
                         {
                             it.UpdatedTime,
                             it.UpdatedUserId,
@@ -1622,7 +1622,7 @@ namespace Myshipping.Application
 
             string batchNo = IDGen.NextID().ToString();
 
-            List<Task<TaskManageOrderResultDto>> taskRunList = new List<Task<TaskManageOrderResultDto>>();
+            List<TaskManageOrderResultDto> taskRunList = new List<TaskManageOrderResultDto>();
 
             _logger.LogInformation("批次={no} ids={ids} 取消任务开始", batchNo, string.Join(",", PKIds));
 
@@ -1637,15 +1637,15 @@ namespace Myshipping.Application
                 foreach (var bk in taskList)
                 {
                     var sortNo = noList.FirstOrDefault(a => a.id == bk.PK_ID).no;
-                    taskRunList.Add(Task.Run(() => InnerManualTask(batchNo, bk, TaskOperTypeEnum.CANCEL_TASK, sortNo)));
+                    taskRunList.Add(InnerManualTask(batchNo, bk, TaskOperTypeEnum.CANCEL_TASK, sortNo).GetAwaiter().GetResult());
                 }
 
-                Task.WaitAll(taskRunList.ToArray());
+                //Task.WaitAll(taskRunList.ToArray());
 
                 result.succ = true;
                 result.msg = "执行成功";
 
-                var downResultList = taskRunList.Select(x => x.Result).ToList();
+                var downResultList = taskRunList.Select(x => x).ToList();
 
                 if (downResultList.Any(x => !x.succ))
                 {
@@ -1705,7 +1705,7 @@ namespace Myshipping.Application
 
             _logger.LogInformation("批次={no} ids={ids} 挂起任务开始", batchNo, string.Join(",", PKIds));
 
-            List<Task<TaskManageOrderResultDto>> taskRunList = new List<Task<TaskManageOrderResultDto>>();
+            List<TaskManageOrderResultDto> taskRunList = new List<TaskManageOrderResultDto>();
 
             try
             {
@@ -1718,15 +1718,15 @@ namespace Myshipping.Application
                 foreach (var bk in taskList)
                 {
                     var sortNo = noList.FirstOrDefault(a => a.id == bk.PK_ID).no;
-                    taskRunList.Add(Task.Run(() => InnerManualTask(batchNo, bk, TaskOperTypeEnum.PENDING_TASK, sortNo)));
+                    taskRunList.Add(InnerManualTask(batchNo, bk, TaskOperTypeEnum.PENDING_TASK, sortNo).GetAwaiter().GetResult());
                 }
 
-                Task.WaitAll(taskRunList.ToArray());
+                //Task.WaitAll(taskRunList.ToArray());
 
                 result.succ = true;
                 result.msg = "执行成功";
 
-                var downResultList = taskRunList.Select(x => x.Result).ToList();
+                var downResultList = taskRunList.Select(x => x).ToList();
 
                 if (downResultList.Any(x => !x.succ))
                 {