From 2830f4acd7f97ef0830b8baf3dea65747801ee39 Mon Sep 17 00:00:00 2001
From: zhangbin <460190368@qq.com>
Date: Wed, 20 Nov 2024 11:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=BB=E5=8A=A1=E6=8E=A5?=
 =?UTF-8?q?=E6=94=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OpenAuth.App/ServiceApp/AdminTaskManageApp.cs | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
index 57adefc..f9346c6 100644
--- a/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
+++ b/OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
@@ -74,14 +74,14 @@ namespace OpenAuth.App.ServiceApp
                         {
                             // 更新上一组的 EndNum
                             var lastGroup = insTaskGroup.Last();
-                            lastGroup.EndNum += everyNum;
+                            lastGroup.EndNum += everyNum - i + 2;
                         }
                         break;  // 最后一组处理完毕，退出循环
                     }
 
                     // 计算每组的起始和结束数字
-                    int beginNum = (i - 1) * 1000 + 1;
-                    int endNum = beginNum + everyNum - 1;
+                    int beginNum = i == 1 ? 1 : (i - 1) * 1000 + i - 1;
+                    int endNum = beginNum == 1 ? 1000 : beginNum + everyNum;
 
                     insTaskGroup.Add(new InsTaskgroup
                     {
@@ -173,8 +173,8 @@ namespace OpenAuth.App.ServiceApp
                     {
                         Id = a.Id.SelectAll(),
                         ShpCount = b.ShpCount,
-                        ReceiveShpCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(r => r.TaskId == a.Id && !string.IsNullOrEmpty(r.ReciveUserId)).Sum(r=>(r.EndNum-r.BeginNum)),
-                        NoReceiveShpCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(r => r.TaskId == a.Id && string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => (r.EndNum - r.BeginNum)),
+                        ReceiveShpCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(r => r.TaskId == a.Id && !string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => (r.EndNum - r.BeginNum + 1)),
+                        NoReceiveShpCount = SqlFunc.Subqueryable<InsTaskgroup>().Where(r => r.TaskId == a.Id && string.IsNullOrEmpty(r.ReciveUserId)).Sum(r => (r.EndNum - r.BeginNum + 1)),
                     }).ToPageListAsync(page, limit, totalCount);
 
                 return new Response<PageInfo<List<InsTaskForAdminResp>>>
@@ -413,11 +413,14 @@ namespace OpenAuth.App.ServiceApp
         {
             using (var db = base.UnitWork.CreateContext())
             {
-                var aiShp = await db.InsAishp.AsQueryable().Select(r => new AiShpForTaskResp()
-                {
-                    Id = r.Id,
-                    ShpName = r.ShpName
-                }).ToListAsync();
+                var aiShp = await db.InsAishp.AsQueryable()
+                    .LeftJoin<InsTask>((r, b) => r.Id == b.ShpId)
+                    .Where((r, b) => b.ShpId == null)
+                    .Select(r => new AiShpForTaskResp()
+                    {
+                        Id = r.Id,
+                        ShpName = r.ShpName
+                    }).ToListAsync();
 
                 return new Response<List<AiShpForTaskResp>>
                 {