FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
FlexJobApi.Core/FlexJobApi.Core.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetCheckReceiveTaskUserInfosQuery.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetCheckReceiveTaskInfosQuery.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs
@@ -14,6 +14,11 @@ /// </summary> public class TaskInfoUser : CommonEntity, IEntityTypeBuilder<TaskInfoUser> { public TaskInfoUser() { Submits = []; } /// <summary> /// 任务Id /// </summary> @@ -54,6 +59,16 @@ /// </summary> public DateTime? CheckReceiveTime { get; set; } /// <summary> /// 最近提交时间 /// </summary> public DateTime? LastSubmitTime { get; set; } /// <summary> /// 提交 /// </summary> public List<TaskInfoUserSubmit> Submits { get; set; } public void Configure(EntityTypeBuilder<TaskInfoUser> entityBuilder, DbContext dbContext, Type dbContextLocator) { entityBuilder FlexJobApi.Core/FlexJobApi.Core.xml
@@ -949,6 +949,16 @@ 验收时间 </summary> </member> <member name="P:FlexJobApi.Core.TaskInfoUser.LastSubmitTime"> <summary> 最近提交时间 </summary> </member> <member name="P:FlexJobApi.Core.TaskInfoUser.Submits"> <summary> 提交 </summary> </member> <member name="T:FlexJobApi.Core.TaskInfoUserSubmit"> <summary> 任务人员提交信息 @@ -3823,71 +3833,6 @@ 发布状态 </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskInfosQuery"> <summary> 查询验收任务分页列表 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQuery.Keywords"> <summary> 关键字 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQuery.SubmitTimeBegin"> <summary> 验收日期-最早时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQuery.SubmitTimeEnd"> <summary> 验收日期-最晚时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQuery.CheckReceiveStatus"> <summary> 验收状态 </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResult"> <summary> 查询验收任务分页列表-结果 </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResultItem"> <summary> 查询验收任务分页列表-结果-项 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResultItem.Id"> <summary> 任务Id </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResultItem.Name"> <summary> 任务名称 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResultItem.BeginTime"> <summary> 任务开始时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResultItem.EndTime"> <summary> 任务结束时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResultItem.AddressName"> <summary> 任务地点名称 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskInfosQueryResultItem.CheckReceiveStatus"> <summary> 验收状态 </summary> </member> <member name="T:FlexJobApi.Core.GetPersonalApplyTaskInfosQuery"> <summary> 我的报名分页列表 @@ -4763,6 +4708,107 @@ 安排状态 </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQuery"> <summary> 查询验收分页列表 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQuery.TaskInfoId"> <summary> 任务Id </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQuery.Keywords"> <summary> 关键字 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQuery.SubmitTimeBegin"> <summary> 验收日期-最早时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQuery.SubmitTimeEnd"> <summary> 验收日期-最晚时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQuery.CheckReceiveStatus"> <summary> 验收状态 </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResult"> <summary> 查询验收任务分页列表-结果 </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem"> <summary> 查询验收任务分页列表-结果-项 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.Id"> <summary> 任务Id </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.TaskName"> <summary> 任务名称 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.BeginTime"> <summary> 任务开始时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.EndTime"> <summary> 任务结束时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.AddressName"> <summary> 任务地点名称 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.Name"> <summary> 姓名 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.Identity"> <summary> 身份证号 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.Birthday"> <summary> 生日 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.Age"> <summary> 年龄 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.ContactPhoneNumber"> <summary> 手机号 </summary> <remarks>联系电话</remarks> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.LastSubmitTime"> <summary> 提交时间 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserInfosQueryResultItem.CheckReceiveStatus"> <summary> 验收状态 </summary> </member> <member name="T:FlexJobApi.Core.GetTaskUsersQuery"> <summary> B端查询应聘报名分页列表信息 FlexJobApi.Core/Models/FlexJobServer/TaskUsers/Queries/GetCheckReceiveTaskUserInfosQuery.cs
New file @@ -0,0 +1,116 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; using System.Text; using System.Threading.Tasks; namespace FlexJobApi.Core { /// <summary> /// 查询验收分页列表 /// </summary> [Resource([EnumResourceController.TaskUser])] public class GetCheckReceiveTaskUserInfosQuery : PagedListQuery<GetCheckReceiveTaskUserInfosQueryResult, GetCheckReceiveTaskUserInfosQueryResultItem> { /// <summary> /// 任务Id /// </summary> public Guid? TaskInfoId { get; set; } /// <summary> /// 关键字 /// </summary> public string Keywords { get; set; } /// <summary> /// 验收日期-最早时间 /// </summary> public DateTime? SubmitTimeBegin { get; set; } /// <summary> /// 验收日期-最晚时间 /// </summary> public DateTime? SubmitTimeEnd { get; set; } /// <summary> /// 验收状态 /// </summary> public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; } } /// <summary> /// 查询验收任务分页列表-结果 /// </summary> public class GetCheckReceiveTaskUserInfosQueryResult : PagedListQueryResult<GetCheckReceiveTaskUserInfosQueryResultItem> { } /// <summary> /// 查询验收任务分页列表-结果-项 /// </summary> public class GetCheckReceiveTaskUserInfosQueryResultItem { /// <summary> /// 任务Id /// </summary> public Guid Id { get; set; } /// <summary> /// 任务名称 /// </summary> public string TaskName { get; set; } /// <summary> /// 任务开始时间 /// </summary> public DateTime BeginTime { get; set; } /// <summary> /// 任务结束时间 /// </summary> public DateTime EndTime { get; set; } /// <summary> /// 任务地点名称 /// </summary> public string AddressName { get; set; } /// <summary> /// 姓名 /// </summary> public string Name { get; set; } /// <summary> /// 身份证号 /// </summary> public string Identity { get; set; } /// <summary> /// 生日 /// </summary> public DateTime? Birthday { get; set; } /// <summary> /// 年龄 /// </summary> public int? Age { get; set; } /// <summary> /// 手机号 /// </summary> /// <remarks>联系电话</remarks> public string ContactPhoneNumber { get; set; } /// <summary> /// 提交时间 /// </summary> public DateTime? LastSubmitTime { get; set; } /// <summary> /// 验收状态 /// </summary> public EnumTaskCheckReceiveStatus CheckReceiveStatus { get; set; } } } FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetCheckReceiveTaskInfosQuery.cs
File was deleted FlexJobApi.FlexJobServer.Application/FlexJobApi.FlexJobServer.Application.xml
@@ -175,5 +175,13 @@ <param name="cancellationToken"></param> <returns></returns> </member> <member name="M:FlexJobApi.FlexJobServer.Application.TaskUserQueryHandler.Handle(FlexJobApi.Core.GetCheckReceiveTaskUserInfosQuery,System.Threading.CancellationToken)"> <summary> 查询验收分页列表 </summary> <param name="request"></param> <param name="cancellationToken"></param> <returns></returns> </member> </members> </doc> FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
@@ -14,9 +14,10 @@ /// 任务人员查询处理器 /// </summary> public class TaskUserQueryHandler( IRepository<TaskInfoUser> rep) : IRepository<TaskInfoUser> rep) : IRequestHandler<GetTaskUsersQuery, GetTaskUsersQueryResult>, IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult> IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult>, IRequestHandler<GetCheckReceiveTaskUserInfosQuery, GetCheckReceiveTaskUserInfosQueryResult> { private readonly IRepository<TaskInfoUser> rep = rep; @@ -67,15 +68,15 @@ var logier = JwtUtils.GetCurrentLogier(); var q = rep.AsQueryable().AsNoTracking() .OrderBy(it => it.CreatedTime) .Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId .Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId && it.TaskInfoId == request.Id && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass && it.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Pass && it.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Pass); if (request.ArrangeStatus.HasValue) { q = q.Where(it=>it.ArrangeStatus == request.ArrangeStatus); q = q.Where(it => it.ArrangeStatus == request.ArrangeStatus); } if (request.Keywords.IsNotNull()) { @@ -107,5 +108,52 @@ }); return await request.PageModel.GetPagedListAsync<GetArrangeTaskUsersQueryResult, GetArrangeTaskUsersQueryResultItem>(s, cancellationToken); } /// <summary> /// 查询验收分页列表 /// </summary> /// <param name="request"></param> /// <param name="cancellationToken"></param> /// <returns></returns> public async Task<GetCheckReceiveTaskUserInfosQueryResult> Handle(GetCheckReceiveTaskUserInfosQuery request, CancellationToken cancellationToken) { var logier = JwtUtils.GetCurrentLogier(); var q = rep.AsQueryable().AsNoTracking() .OrderBy(it => it.CreatedTime) .AsQueryable(); if (logier.Type == EnumUserType.Personal) { q = q.Where(it => it.EnterpriseEmployee.UserId == logier.Id); } else if (logier.Type == EnumUserType.Enterprise) { q = q.Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId); } if (request.TaskInfoId.HasValue) { q = q.Where(it => it.TaskInfoId == request.TaskInfoId); } if (request.Keywords.IsNotNull()) { q = q.Where(it => it.EnterpriseEmployee.User.Name.Contains(request.Keywords) || it.EnterpriseEmployee.User.ContactPhoneNumber.Contains(request.Keywords) || it.EnterpriseEmployee.User.Identity.Contains(request.Keywords)); } if (request.SubmitTimeBegin.HasValue && request.SubmitTimeEnd.HasValue) { q = q.Where(it => it.Submits.Any(s => request.SubmitTimeBegin <= s.CreatedTime && s.CreatedTime <= request.SubmitTimeEnd)); } if (request.CheckReceiveStatus.HasValue) { q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus); } var s = q.Select(it => new GetCheckReceiveTaskUserInfosQueryResultItem { }); return await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserInfosQueryResult, GetCheckReceiveTaskUserInfosQueryResultItem>(s, cancellationToken); } } }