From 5a9ef67f0e96a1af2c25731d62755f0bd9751a3b Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 13:57:52 +0800
Subject: [PATCH] pref:任务列表
---
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 50cd830..d6ccaf1 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -55,9 +55,9 @@
{
q = q.Where(it => it.Name.Contains(request.Keywords));
}
- if (request.Time.HasValue)
+ if (request.BeginTime.HasValue && request.EndTime.HasValue)
{
- q = q.Where(it => it.BeginTime <= request.Time && request.Time <= it.EndTime);
+ q = q.Where(it => request.BeginTime <= it.BeginTime && it.BeginTime <= request.EndTime);
}
if (request.CityCode.IsNotNull())
{
@@ -87,8 +87,10 @@
{
q = q.Where(it => it.RecommendStatus == request.RecommendStatus);
}
- var s = from t in q
+ var s = from t in q.Include(it => it.Province).Include(it => it.City)
join tu in rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking() on t.Id equals tu.TaskInfoId into tug
+ join tb in rep.Change<TaskInfoBenefit>().AsQueryable().AsNoTracking().Include(it => it.Benefit) on t.Id equals tb.TaskInfoId into tbg
+ join tc in rep.Change<TaskInfoCredentialLimit>().AsQueryable().AsNoTracking().Include(it => it.Type) on t.Id equals tc.TaskInfoId into tcg
select new GetTaskInfosQueryResultItem
{
Id = t.Id,
@@ -97,12 +99,34 @@
BillingMethod = t.BillingMethod,
ServiceFee = t.ServiceFee,
SettlementCycle = t.SettlementCycle,
+ Benefits = tbg.Select(it => new GetTaskInfoQueryResultBenefit
+ {
+ BenefitCode = it.BenefitCode,
+ BenefitContent = it.Benefit.Content
+ }).ToList(),
GenderLimit = t.GenderLimit,
+ CredentialLimits = tcg.Select(it => new GetTaskInfoQueryResultCredentialLimit
+ {
+ TypeCode = it.TypeCode,
+ TypeContent = it.Type.Content
+ }).ToList(),
+ ProvinceCode = t.ProvinceCode,
+ ProvinceContent =t.Province.Content,
+ CityCode = t.CityCode,
+ CityContent = t.City.Content,
+ AddressName = t.AddressName,
+ AddressDetail = t.AddressDetail,
+ Latitude = t.Latitude,
+ Longitude = t.Longitude,
UserCount = tug.Count(),
Status = t.Status,
BeginTime = t.BeginTime,
EndTime = t.EndTime,
- ReleaseStatus = t.ReleaseStatus
+ ReleaseStatus = t.ReleaseStatus,
+ CheckReceiveStatus = t.CheckReceiveStatus,
+ CreatedTime = t.CreatedTime,
+ RecommendStatus = t.RecommendStatus,
+ SettlementStatus = t.SettlementStatus
};
return request.PageModel.GetPagedListAsync(s, cancellationToken);
}
--
Gitblit v1.9.1