From 809cd3966929f4c4f190ed8aa604d137227fe641 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 15:39:38 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/settings.json | 2 +-
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 19 +++++++++++++++----
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs | 19 +++++++++++++++++--
FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs | 1 +
4 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs
index c5d4cb7..cc11c3f 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs
@@ -15,9 +15,24 @@
public class GetCheckReceiveTaskUserSubmitQuery : IRequest<GetCheckReceiveTaskUserSubmitQueryResult>
{
/// <summary>
- /// 鎻愪氦Id
+ /// 鎻愪氦Id锛堢敤浜嶣绔鎴风锛�
/// </summary>
- public Guid Id { get; set; }
+ public Guid? SubmitId { get; set; }
+
+ /// <summary>
+ /// 浠诲姟Id锛堢敤浜嶤绔皬绋嬪簭缂栬緫鎻愪氦 鍜屾棩鏈熶竴璧蜂紶锛�
+ /// </summary>
+ public Guid? TaskInfoId { get; set; }
+
+ /// <summary>
+ /// 浠诲姟浜哄憳Id锛堢敤浜嶣绔皬绋嬪簭楠屾敹 鍜屾棩鏈熶竴璧蜂紶锛�
+ /// </summary>
+ public Guid? TaskInfoUserId { get; set; }
+
+ /// <summary>
+ /// 鏃ユ湡锛堢敤浜庝袱涓皬绋嬪簭 璺熸煇涓�涓狪d涓�璧蜂紶锛�
+ /// </summary>
+ public DateTime? Date { get; set; }
}
/// <summary>
diff --git a/FlexJobApi.Core/settings.json b/FlexJobApi.Core/settings.json
index b708b4f..6b673c3 100644
--- a/FlexJobApi.Core/settings.json
+++ b/FlexJobApi.Core/settings.json
@@ -37,7 +37,7 @@
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
- "Microsoft.EntityFrameworkCore": "Warning"
+ "Microsoft.EntityFrameworkCore": "Information"
},
"File": {
"FileName": "Logs/logs{0:yyyy}{0:MM}{0:dd}.txt",
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index ef3b8e8..8bb400a 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -111,7 +111,7 @@
}
var s = q.Select(it => new GetCheckReceiveTaskQueryResultItem
{
- Id = it.TaskInfoId,
+ Id = it.Id,
TaskInfoCode = it.TaskInfo.Code,
TaskInfoName = it.TaskInfo.Name,
Avatar = it.EnterpriseEmployee.User.Avatar,
@@ -167,9 +167,20 @@
/// <returns></returns>
public Task<GetCheckReceiveTaskUserSubmitQueryResult> Handle(GetCheckReceiveTaskUserSubmitQuery request, CancellationToken cancellationToken)
{
- return repTaskInfoUserSubmit.AsQueryable().AsNoTracking()
- .Where(it => it.Id == request.Id)
- .GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
+ var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking();
+ if (request.SubmitId.HasValue)
+ {
+ q = q.Where(it => it.Id == request.SubmitId.Value);
+ }
+ else if (request.Date.HasValue && request.TaskInfoId.HasValue)
+ {
+ q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUser.TaskInfoId == request.TaskInfoId.Value);
+ }
+ else if (request.Date.HasValue && request.TaskInfoUserId.HasValue)
+ {
+ q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUserId == request.TaskInfoUserId.Value);
+ }
+ return q.GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
}
}
}
diff --git a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
index 94880e8..6f0e55f 100644
--- a/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
+++ b/FlexJobApi.UserServer.Application/Auths/Commands/LoginCommandHandler.cs
@@ -249,6 +249,7 @@
Type = EnumUserType.Personal,
UserName = request.PhoneNumber,
PhoneNumber = request.PhoneNumber,
+ ContactPhoneNumber = request.PhoneNumber,
IsCheckPhoneNumber = true,
Level = 1,
Status = EnumUserStatus.Normal
--
Gitblit v1.9.1