From 7912941b7ab3917f91657689b1c8dd01e5cd93f3 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 08 八月 2025 14:11:28 +0800
Subject: [PATCH] fix:bug
---
FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml | 2
FlexJobApi.Core/Entities/Tasks/TaskInfo.cs | 5 ++
FlexJobApi.Core/FlexJobApi.Core.xml | 55 +++++++++++++++++++++++++++
FlexJobApi.UserServer.Application/Auths/Commands/VerifyCodeCommandHandler.cs | 4 +-
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 17 ++++----
FlexJobApi.Core/Models/UserServer/Auths/Commands/SendVerifyCodeCommand.cs | 2
6 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs b/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs
index 54a2ed5..141310e 100644
--- a/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs
+++ b/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs
@@ -157,6 +157,11 @@
/// </summary>
public EnumTaskRecommendStatus RecommendStatus { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛
+ /// </summary>
+ public List<TaskInfoUser> Users { get; set; }
+
public void Configure(EntityTypeBuilder<TaskInfo> entityBuilder, DbContext dbContext, Type dbContextLocator)
{
entityBuilder
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index dc5bba5..05b167b 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -684,6 +684,11 @@
鎺ㄨ崘鐘舵��
</summary>
</member>
+ <member name="P:FlexJobApi.Core.TaskInfo.Users">
+ <summary>
+ 鐢ㄦ埛
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.TaskInfoBenefit">
<summary>
浠诲姟绂忓埄
@@ -3290,11 +3295,61 @@
缁撶畻鏂瑰紡
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.Benefits">
+ <summary>
+ 绂忓埄
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.GenderLimit">
<summary>
鎬у埆瑕佹眰
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.CredentialLimits">
+ <summary>
+ 璧勬牸璇佷功绫诲瀷
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.ProvinceCode">
+ <summary>
+ 浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.ProvinceContent">
+ <summary>
+ 浠诲姟鍦扮偣鎵�灞炵渷浠�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.CityCode">
+ <summary>
+ 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.CityContent">
+ <summary>
+ 浠诲姟鍦扮偣鎵�灞炲煄甯�
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.AddressName">
+ <summary>
+ 浠诲姟鍦扮偣鍚嶇О
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.AddressDetail">
+ <summary>
+ 浠诲姟鍦扮偣璇︾粏鍦板潃
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.Longitude">
+ <summary>
+ 缁忓害
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.Latitude">
+ <summary>
+ 绾害
+ </summary>
+ </member>
<member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.UserCount">
<summary>
鎶ュ悕浜烘暟
diff --git a/FlexJobApi.Core/Models/UserServer/Auths/Commands/SendVerifyCodeCommand.cs b/FlexJobApi.Core/Models/UserServer/Auths/Commands/SendVerifyCodeCommand.cs
index c2b2159..b527e3a 100644
--- a/FlexJobApi.Core/Models/UserServer/Auths/Commands/SendVerifyCodeCommand.cs
+++ b/FlexJobApi.Core/Models/UserServer/Auths/Commands/SendVerifyCodeCommand.cs
@@ -11,7 +11,7 @@
/// 鍙戦�侀獙璇佺爜
/// </summary>
[Resource([EnumResourceController.Auth], AllowAnonymous = true)]
- public class SendVerifyCodeCommand : IRequest
+ public class SendVerifyCodeCommand : IRequest<Guid>
{
/// <summary>
/// 鎵嬫満鍙风爜
diff --git a/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml b/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
index 914b77f..4927d0b 100644
--- a/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
+++ b/FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
@@ -166,7 +166,7 @@
浠诲姟鏌ヨ澶勭悊鍣�
</summary>
</member>
- <member name="M:FlexJobApi.FlexJobServer.Application.TaskInfoQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.TaskInfo})">
+ <member name="M:FlexJobApi.FlexJobServer.Application.TaskInfoQueryHandler.#ctor(Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.TaskInfo},Furion.DatabaseAccessor.IRepository{FlexJobApi.Core.DictionaryData})">
<summary>
浠诲姟鏌ヨ澶勭悊鍣�
</summary>
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index d6ccaf1..4a45d2e 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -16,13 +16,15 @@
/// 浠诲姟鏌ヨ澶勭悊鍣�
/// </summary>
public class TaskInfoQueryHandler(
- IRepository<TaskInfo> rep
+ IRepository<TaskInfo> rep,
+ IRepository<DictionaryData> repDictionaryData
) :
IRequestHandler<GetTaskInfoQuery, GetTaskInfoQueryResult>,
IRequestHandler<GetTaskInfosQuery, PagedListQueryResult<GetTaskInfosQueryResultItem>>
{
private readonly IRepository<TaskInfo> rep = rep;
+ private readonly IRepository<DictionaryData> repDictionaryData = repDictionaryData;
/// <summary>
/// 鏌ヨ浠诲姟璇︽儏
@@ -87,10 +89,7 @@
{
q = q.Where(it => it.RecommendStatus == request.RecommendStatus);
}
- 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
+ var s = from t in q
select new GetTaskInfosQueryResultItem
{
Id = t.Id,
@@ -99,26 +98,26 @@
BillingMethod = t.BillingMethod,
ServiceFee = t.ServiceFee,
SettlementCycle = t.SettlementCycle,
- Benefits = tbg.Select(it => new GetTaskInfoQueryResultBenefit
+ Benefits = t.Benefits.Select(it => new GetTaskInfoQueryResultBenefit
{
BenefitCode = it.BenefitCode,
BenefitContent = it.Benefit.Content
}).ToList(),
GenderLimit = t.GenderLimit,
- CredentialLimits = tcg.Select(it => new GetTaskInfoQueryResultCredentialLimit
+ CredentialLimits = t.CredentialLimits.Select(it => new GetTaskInfoQueryResultCredentialLimit
{
TypeCode = it.TypeCode,
TypeContent = it.Type.Content
}).ToList(),
ProvinceCode = t.ProvinceCode,
- ProvinceContent =t.Province.Content,
+ 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(),
+ UserCount = t.Users.Count(),
Status = t.Status,
BeginTime = t.BeginTime,
EndTime = t.EndTime,
diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/VerifyCodeCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/VerifyCodeCommandHandler.cs
index 00c5761..53f1941 100644
--- a/FlexJobApi.UserServer.Application/Auths/Commands/VerifyCodeCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Auths/Commands/VerifyCodeCommandHandler.cs
@@ -13,7 +13,7 @@
/// 楠岃瘉鐮佸懡浠ゅ鐞嗗櫒
/// </summary>
public class VerifyCodeCommandHandler
- : IRequestHandler<SendVerifyCodeCommand>
+ : IRequestHandler<SendVerifyCodeCommand, Guid>
{
/// <summary>
/// 鍙戦�侀獙璇佺爜
@@ -21,7 +21,7 @@
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
- public Task Handle(SendVerifyCodeCommand request, CancellationToken cancellationToken)
+ public Task<Guid> Handle(SendVerifyCodeCommand request, CancellationToken cancellationToken)
{
throw new Exception();
//var callback = new FriendlyEmptyCallback();
--
Gitblit v1.9.1