From 6001ccc7e7052b64931235b65a8b5d02f35ad1bd Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 09:56:24 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 81dc10c..eafd2a4 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -93,7 +93,23 @@
q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
}
}
- var s = q.ProjectToType<GetCheckReceiveTasksQueryResultItem>();
+ var s = q.Select(it => new GetCheckReceiveTasksQueryResultItem
+ {
+ Id = it.Id,
+ Name = it.Name,
+ Code = it.Code,
+ BillingMethod = it.BillingMethod,
+ ServiceFee = it.ServiceFee,
+ SettlementCycle = it.SettlementCycle,
+ CreatedTime = it.CreatedTime,
+ BeginTime = it.BeginTime,
+ EndTime = it.EndTime,
+ AddressName = it.AddressName,
+ LastCheckReceiveTime = it.LastCheckReceiveTime,
+ CheckReceiveStatus = logier.Type == EnumUserType.Enterprise && logier.ClientType == EnumClientType.Wxmp && request.Date.HasValue
+ ? request.CheckReceiveStatus
+ : it.CheckReceiveStatus,
+ });
return await request.PageModel.GetPagedListAsync<GetCheckReceiveTasksQueryResult, GetCheckReceiveTasksQueryResultItem>(s, cancellationToken);
}
@@ -154,13 +170,22 @@
ContactPhoneNumber = it.EnterpriseEmployee.User.ContactPhoneNumber,
IsReal = it.EnterpriseEmployee.User.IsReal,
RealMethod = it.EnterpriseEmployee.User.RealMethod,
- CheckReceiveStatus = it.CheckReceiveStatus,
+ CheckReceiveStatus = logier.Type == EnumUserType.Enterprise && logier.ClientType == EnumClientType.Wxmp && request.Date.HasValue
+ ? it.Submits
+ .Where(s => s.Date == request.Date)
+ .Select(s => (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
+ ? EnumTaskCheckReceiveStatus.WaitSubmit
+ : s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
+ ? EnumTaskCheckReceiveStatus.WaitCheckReceive
+ : EnumTaskCheckReceiveStatus.Completed) as EnumTaskCheckReceiveStatus?)
+ .FirstOrDefault() ?? EnumTaskCheckReceiveStatus.WaitSubmit
+ : it.CheckReceiveStatus,
LastSubmitTime = it.LastSubmitTime,
});
var result = await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskQueryResult, GetCheckReceiveTaskQueryResultItem>(s, cancellationToken);
result.ObjectData = await repTaskInfo.AsQueryable().AsNoTracking()
- .Where(it => it.Id == request.TaskInfoId)
- .GetDetail<TaskInfo, GetCheckReceiveTaskQueryResultObjectData>();
+ .Where(it => it.Id == request.TaskInfoId)
+ .GetDetail<TaskInfo, GetCheckReceiveTaskQueryResultObjectData>();
return result;
}
@@ -199,7 +224,7 @@
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public Task<GetCheckReceiveTaskUserSubmitQueryResult> Handle(GetCheckReceiveTaskUserSubmitQuery request, CancellationToken cancellationToken)
+ public async Task<GetCheckReceiveTaskUserSubmitQueryResult> Handle(GetCheckReceiveTaskUserSubmitQuery request, CancellationToken cancellationToken)
{
var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking();
if (request.SubmitId.HasValue)
@@ -214,7 +239,12 @@
{
q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUserId == request.TaskInfoUserId.Value);
}
- return q.GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
+ var model = await q.GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
+ model.Files = await repTaskInfoUserSubmit.Change<TaskInfoUserSubmitFile>().AsQueryable().AsNoTracking()
+ .Where(it => it.SubmitId == model.Id)
+ .Select(it => it.File)
+ .ToListAsync();
+ return model;
}
}
}
--
Gitblit v1.9.1