diff --git a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs index f9346c6..a1ad8a9 100644 --- a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs +++ b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs @@ -69,19 +69,21 @@ namespace OpenAuth.App.ServiceApp // 如果是最后一组,并且剩余的少于1000,将剩余的任务加到上一组 if (i == groupNum && lastGroupRemaining < 1000) { - everyNum = lastGroupRemaining; - if (i > 1) - { - // 更新上一组的 EndNum - var lastGroup = insTaskGroup.Last(); - lastGroup.EndNum += everyNum - i + 2; - } + //everyNum = lastGroupRemaining; + //if (i > 1) + //{ + // // 更新上一组的 EndNum + // var lastGroup = insTaskGroup.Last(); + // lastGroup.EndNum += everyNum - i + 2; + //} + var lastGroup = insTaskGroup.Last(); + lastGroup.EndNum = (int)aishp.ShpCount; break; // 最后一组处理完毕,退出循环 } // 计算每组的起始和结束数字 - int beginNum = i == 1 ? 1 : (i - 1) * 1000 + i - 1; - int endNum = beginNum == 1 ? 1000 : beginNum + everyNum; + int beginNum = i == 1 ? 1 : (i - 1) * 1000 + 1; + int endNum = beginNum == 1 ? 1000 : beginNum + 999; insTaskGroup.Add(new InsTaskgroup { @@ -173,8 +175,11 @@ namespace OpenAuth.App.ServiceApp { Id = a.Id.SelectAll(), ShpCount = b.ShpCount, - ReceiveShpCount = SqlFunc.Subqueryable().Where(r => r.TaskId == a.Id && !string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => (r.EndNum - r.BeginNum + 1)), - NoReceiveShpCount = SqlFunc.Subqueryable().Where(r => r.TaskId == a.Id && string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => (r.EndNum - r.BeginNum + 1)), + ReceiveShpCount = SqlFunc.Subqueryable().Where(r => r.TaskId == a.Id && !string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => + (r.EndNum - r.BeginNum + 1) + ), + NoReceiveShpCount = SqlFunc.Subqueryable().Where(r => r.TaskId == a.Id && string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => + (r.EndNum - r.BeginNum + 1)), }).ToPageListAsync(page, limit, totalCount); return new Response>>