From fed0f0b4f2abeca2ee641ee3f95416f68a06fe09 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 19:06:44 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 33 ++++++++++++++--
FlexJobApi.Core/FlexJobApi.Core.xml | 61 ++++++++++++++++++++++++++++++
2 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 33ce614..7589cf9 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -5657,6 +5657,62 @@
鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛鑿滃崟
</summary>
</member>
+ <member name="T:FlexJobApi.Core.EditEnterpriseEmployeeCommand">
+ <summary>
+ 缂栬緫鐏靛伐淇℃伅
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.Id">
+ <summary>
+ 鐏靛伐Id
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.Name">
+ <summary>
+ 濮撳悕
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.Identity">
+ <summary>
+ 韬唤璇佸彿
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.ContactPhoneNumber">
+ <summary>
+ 鎵嬫満鍙�
+ </summary>
+ <remarks>鑱旂郴鐢佃瘽</remarks>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.Gender">
+ <summary>
+ 鎬у埆
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.Age">
+ <summary>
+ 骞撮緞
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.IdentityImg">
+ <summary>
+ 韬唤璇佷汉鍍忛潰
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.EditEnterpriseEmployeeCommand.IdentityBackImg">
+ <summary>
+ 韬唤璇佸浗寰介潰
+ </summary>
+ </member>
+ <member name="T:FlexJobApi.Core.ImportEnterpriseEmployeesCommand">
+ <summary>
+ 瀵煎叆鐏靛伐淇℃伅
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.ImportEnterpriseEmployeesCommand.ExcelUrl">
+ <summary>
+ Excel鍦板潃
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.GetEnterpriseEmployeeQuery">
<summary>
鏌ヨ鐏靛伐璇︽儏
@@ -7812,6 +7868,11 @@
缁忓巻
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetUserResumeQueryResult.IsCollected">
+ <summary>
+ 鏄惁宸叉敹钘�
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.GetUserResumeQueryResultExpectJob">
<summary>
鏌ヨ鐢ㄦ埛绠�鍘�-缁撴灉
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 9e3e283..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;
}
--
Gitblit v1.9.1