Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Service/TaskManagePlat/TaskManageService.cs

@@ -316,7 +316,8 @@ namespace Myshipping.Application
         /// </summary>
         /// <param name="isReCalc">是否强制计算</param>
         /// <returns>返回回执</returns>
-        public async Task<TaskUserStatResultInfo> GetCurrentTotalStat(bool isReCalc = false)
+        [HttpGet("/TaskManage/GetCurrentTotalStat")]
+        public async Task<TaskUserStatResultInfo> GetCurrentTotalStat([FromQuery]bool isReCalc = false)
         {
             TaskUserStatResultInfo resultInfo = new TaskUserStatResultInfo { 
                 LevelTop = new List<TaskUserStatItem>(),
@@ -388,7 +389,7 @@ namespace Myshipping.Application
                                     TopKey = TaskStatLevelEnum.EXCPTION.ToString(),
                                     Key = currEnum.ToString(),
                                     Name = currEnum.GetDescription(),
-                                    Total = exceptList.Sum(t => t.Total),
+                                    Total = t.Total,
                                     SortNo = (int)currEnum,
                                     ActionKey = $"{TaskStatLevelEnum.EXCPTION.ToString()}#{currEnum.ToString()}"
                                 });
@@ -422,7 +423,7 @@ namespace Myshipping.Application
                         {
                             Key = TaskStatLevelEnum.PERSON.ToString(),
                             Name = TaskStatLevelEnum.PERSON.GetDescription(),
-                            Total = exceptList.Sum(t => t.Total),
+                            Total = personList.Sum(t => t.Total),
                             SortNo = (int)TaskStatLevelEnum.PERSON,
                             ActionKey = TaskStatLevelEnum.PERSON.ToString()
                         });
@@ -437,7 +438,7 @@ namespace Myshipping.Application
                                     TopKey = TaskStatLevelEnum.PERSON.ToString(),
                                     Key = currEnum.ToString(),
                                     Name = currEnum.GetDescription(),
-                                    Total = exceptList.Sum(t => t.Total),
+                                    Total = t.Total,
                                     SortNo = (int)currEnum,
                                     ActionKey = $"{TaskStatLevelEnum.PERSON.ToString()}#{currEnum.ToString()}"
                                 });
@@ -471,7 +472,7 @@ namespace Myshipping.Application
                         {
                             Key = TaskStatLevelEnum.PUBLIC.ToString(),
                             Name = TaskStatLevelEnum.PUBLIC.GetDescription(),
-                            Total = exceptList.Sum(t => t.Total),
+                            Total = publicList.Sum(t => t.Total),
                             SortNo = (int)TaskStatLevelEnum.PUBLIC,
                             ActionKey = TaskStatLevelEnum.PUBLIC.ToString()
                         });
@@ -486,7 +487,7 @@ namespace Myshipping.Application
                                     TopKey = TaskStatLevelEnum.PUBLIC.ToString(),
                                     Key = currEnum.ToString(),
                                     Name = currEnum.GetDescription(),
-                                    Total = exceptList.Sum(t => t.Total),
+                                    Total = t.Total,
                                     SortNo = (int)currEnum,
                                     ActionKey = $"{TaskStatLevelEnum.PUBLIC.ToString()}#{currEnum.ToString()}"
                                 });