HC_YFZX
/
Infrastructure
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改任务接收查询

Insight
zhangbin 2024-11-20 11:43:46 +08:00
parent 295c5d1a5c
commit 2830f4acd7
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenAuth.App/ServiceApp/AdminTaskManageApp.cs
View File

@ -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>>
{