FlexJobApi.Core/FlexJobApi.Core.xml
@@ -4005,9 +4005,24 @@ 查询验收提交详情 </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.Id"> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.SubmitId"> <summary> 提交Id 提交Id(用于B端客户端) </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.TaskInfoId"> <summary> 任务Id(用于C端小程序编辑提交 和日期一起传) </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.TaskInfoUserId"> <summary> 任务人员Id(用于B端小程序验收 和日期一起传) </summary> </member> <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQuery.Date"> <summary> 日期(用于两个小程序 跟某一个Id一起传) </summary> </member> <member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitQueryResult"> FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Queries/GetCheckReceiveTasksQuery.cs
@@ -19,6 +19,11 @@ public DateTime? Date { get; set; } /// <summary> /// 关键字(姓名/手机/身份证号) /// </summary> public string Keywords { get; set; } /// <summary> /// 验收日期-最早时间(B端客户端-验收管理专用) /// </summary> public DateTime? CheckReceiveTimeBegin { get; set; } @@ -78,6 +83,11 @@ public EnumSettlementCycle SettlementCycle { get; set; } /// <summary> /// 发布时间 /// </summary> public DateTimeOffset CreatedTime { get; set; } /// <summary> /// 任务开始时间 /// </summary> public DateTime BeginTime { get; set; } FlexJobApi.Core/Models/FlexJobServer/Tasks/Queries/GetTaskInfosQuery.cs
@@ -242,7 +242,7 @@ public EnumTaskRecommendStatus RecommendStatus { get; set; } /// <summary> /// 创建时间 /// 发布时间 /// </summary> public DateTimeOffset CreatedTime { get; set; } } FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -49,6 +49,14 @@ { q = q.Where(it => it.EnterpriseId == logier.EnterpriseId); } if (request.Keywords.IsNotNull()) { q = q.Where(it => it.TaskInfoUsers.Any(tu => tu.EnterpriseEmployee.User.Name.Contains(request.Keywords) || tu.EnterpriseEmployee.User.PhoneNumber.Contains(request.Keywords) || tu.EnterpriseEmployee.User.Identity.Contains(request.Keywords))); } if (logier.ClientType == EnumClientType.Wxmp) { if (request.CheckReceiveStatus == null) @@ -156,6 +164,8 @@ result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking() .Where(it => it.Id == request.Id) .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>(); await repTaskInfo.Change<UserBankCard>() return result; } FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -118,7 +118,7 @@ } if (request.BeginTime.HasValue && request.EndTime.HasValue) { q = q.Where(it => request.BeginTime <= it.BeginTime && it.BeginTime <= request.EndTime); q = q.Where(it => request.BeginTime <= it.CreatedTime && it.CreatedTime <= request.EndTime); } if (request.CityCode.IsNotNull()) {