FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTaskUserSubmitQuery.cs
@@ -15,9 +15,24 @@ public class GetCheckReceiveTaskUserSubmitQuery : IRequest<GetCheckReceiveTaskUserSubmitQueryResult> { /// <summary> /// 提交Id /// 提交Id(用于B端客户端) /// </summary> public Guid Id { get; set; } public Guid? SubmitId { get; set; } /// <summary> /// 任务Id(用于C端小程序编辑提交 和日期一起传) /// </summary> public Guid? TaskInfoId { get; set; } /// <summary> /// 任务人员Id(用于B端小程序验收 和日期一起传) /// </summary> public Guid? TaskInfoUserId { get; set; } /// <summary> /// 日期(用于两个小程序 跟某一个Id一起传) /// </summary> public DateTime? Date { get; set; } } /// <summary> 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", 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>(); } } } 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