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.Core/FlexJobApi.Core.xml | 36 ++++++++++++++++-
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs | 50 +++++++++++++++++++++++++
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 22 ++++++++++
3 files changed, 104 insertions(+), 4 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index dec6d96..dc5bba5 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -2530,7 +2530,7 @@
缂栧彿
</summary>
</member>
- <member name="P:FlexJobApi.Core.Models.Common.DictionaryDataQueryModel.Name">
+ <member name="P:FlexJobApi.Core.Models.Common.DictionaryDataQueryModel.Content">
<summary>
鍚嶇О
</summary>
@@ -3115,7 +3115,7 @@
浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙�
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetTaskInfoQueryResult.ProvinceName">
+ <member name="P:FlexJobApi.Core.GetTaskInfoQueryResult.ProvinceContent">
<summary>
浠诲姟鍦扮偣鎵�灞炵渷浠�
</summary>
@@ -3125,7 +3125,7 @@
浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙�
</summary>
</member>
- <member name="P:FlexJobApi.Core.GetTaskInfoQueryResult.CityName">
+ <member name="P:FlexJobApi.Core.GetTaskInfoQueryResult.CityContent">
<summary>
浠诲姟鍦扮偣鎵�灞炲煄甯�
</summary>
@@ -3170,6 +3170,36 @@
鏄惁宸叉敹钘�
</summary>
</member>
+ <member name="T:FlexJobApi.Core.GetTaskInfoQueryResultBenefit">
+ <summary>
+ 鏌ヨ浠诲姟璇︽儏-缁撴灉-绂忓埄
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfoQueryResultBenefit.BenefitCode">
+ <summary>
+ 绂忓埄缂栧彿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfoQueryResultBenefit.BenefitContent">
+ <summary>
+ 绂忓埄
+ </summary>
+ </member>
+ <member name="T:FlexJobApi.Core.GetTaskInfoQueryResultCredentialLimit">
+ <summary>
+ 鏌ヨ浠诲姟璇︽儏-缁撴灉-璇佷功闄愬埗
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfoQueryResultCredentialLimit.TypeCode">
+ <summary>
+ 璇佷功绫诲瀷缂栧彿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfoQueryResultCredentialLimit.TypeContent">
+ <summary>
+ 璇佷功绫诲瀷
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.GetTaskInfosQuery">
<summary>
鏌ヨ浠诲姟鍒嗛〉鍒楄〃
diff --git a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
index 9cb25d4..cff4449 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
@@ -106,11 +106,61 @@
public EnumSettlementCycle SettlementCycle { get; set; }
/// <summary>
+ /// 绂忓埄
+ /// </summary>
+ public List<GetTaskInfoQueryResultBenefit> Benefits { get; set; }
+
+ /// <summary>
/// 鎬у埆瑕佹眰
/// </summary>
public EnumUserGender GenderLimit { get; set; }
/// <summary>
+ /// 璧勬牸璇佷功绫诲瀷
+ /// </summary>
+ public List<GetTaskInfoQueryResultCredentialLimit> CredentialLimits { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙�
+ /// </summary>
+ public string ProvinceCode { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍦扮偣鎵�灞炵渷浠�
+ /// </summary>
+ public string ProvinceContent { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙�
+ /// </summary>
+ public string CityCode { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍦扮偣鎵�灞炲煄甯�
+ /// </summary>
+ public string CityContent { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍦扮偣鍚嶇О
+ /// </summary>
+ public string AddressName { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍦扮偣璇︾粏鍦板潃
+ /// </summary>
+ public string AddressDetail { get; set; }
+
+ /// <summary>
+ /// 缁忓害
+ /// </summary>
+ public decimal? Longitude { get; set; }
+
+ /// <summary>
+ /// 绾害
+ /// </summary>
+ public decimal? Latitude { get; set; }
+
+ /// <summary>
/// 鎶ュ悕浜烘暟
/// </summary>
public int UserCount { get; set; }
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index ce5cbb0..d6ccaf1 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -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,7 +99,25 @@
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,
--
Gitblit v1.9.1