From 3a57c342ff5b39467b9dd0d5ba3c624311a581f1 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 22 八月 2025 16:44:06 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs | 80 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 73 insertions(+), 7 deletions(-) diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs index f59f0f7..2a300aa 100644 --- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs +++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Queries/EnterpriseEmployeeQueryHandler.cs @@ -18,7 +18,9 @@ IRepository<EnterpriseEmployee> rep ) : IRequestHandler<GetEnterpriseEmployeesQuery, GetEnterpriseEmployeesQueryResult>, - IRequestHandler<GetEnterpriseEmployeeQuery, GetEnterpriseEmployeeQueryResult> + IRequestHandler<GetEnterpriseEmployeeQuery, GetEnterpriseEmployeeQueryResult>, + IRequestHandler<GetPersonalUserElectronSignsQuery, GetPersonalUserElectronSignsQueryResult>, + IRequestHandler<GetPersonalUserElectronSignQuery, GetPersonalUserElectronSignQueryResult> { private readonly IRepository<EnterpriseEmployee> rep = rep; @@ -57,7 +59,7 @@ } if (request.HireStatus.HasValue) { - q = q.Where(it => it.HireStatus == request.HireStatus); + q = q.Where(it => it.TaskInfoUsers.Any(tu => tu.HireStatus == request.HireStatus)); } if (request.IsReal.HasValue) { @@ -80,18 +82,26 @@ Gender = it.Gender, Age = it.Age, ContactPhoneNumber = it.ContactPhoneNumber, - UserIsReal = it.User.IsReal, + UserIsReal = it.User.IsReal == true, RealMethod = it.User.RealMethod, PersonalIdentityCode = it.User.PersonalIdentityCode, PersonalIdentityContent = it.User.PersonalIdentity.Content, EducationalBackgroundCode = it.User.EducationalBackgroundCode, EducationalBackgroundContent = it.User.EducationalBackground.Content, - TaskCount = it.User.EnterpriseEmployees.Where(ee => ee.HireStatus == EnumTaskUserHireStatus.Pass).Sum(ee => ee.TaskInfoUsers.Count()), + TaskCount = it.User.EnterpriseEmployees.SelectMany(ee => ee.TaskInfoUsers).Count(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass), WorkSeniority = it.User.WorkSeniority, WorkExperience = it.User.WorkExperience, - HireStatus = it.HireStatus, + HireStatus = it.TaskInfoUsers.Any(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass) + ? EnumTaskUserHireStatus.Pass + : it.TaskInfoUsers.Any(tu => tu.HireStatus == EnumTaskUserHireStatus.Refuse) + ? EnumTaskUserHireStatus.Refuse + : EnumTaskUserHireStatus.Wait, UserSignContractStatus = it.UserSignContractStatus, - HireTime = it.HireTime, + HireTime = it.TaskInfoUsers + .OrderBy(tu => tu.HireTime) + .Where(tu => tu.HireStatus == EnumTaskUserHireStatus.Pass && tu.HireTime.HasValue) + .Select(tu => tu.HireTime) + .FirstOrDefault(), UserRealTime = it.User.RealTime, UserSignContractTime = it.UserSignContractTime, EnterpriseSignContractStatus = it.EnterpriseSignContractStatus, @@ -127,7 +137,63 @@ .Select(it => it.CreatedTime as DateTimeOffset?) .FirstOrDefaultAsync(cancellationToken); } - + + return model; + } + + /// <summary> + /// 鏌ヨ涓汉鐢ㄦ埛绛剧害鍒楄〃 + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<GetPersonalUserElectronSignsQueryResult> Handle(GetPersonalUserElectronSignsQuery request, CancellationToken cancellationToken) + { + var logier = JwtUtils.GetCurrentLogier(); + var q = rep.AsQueryable().AsNoTracking() + .Where(it => it.UserId == logier.Id); + if (request.UserSignContractStatus.HasValue) + { + q = q.Where(it => it.UserSignContractStatus == request.UserSignContractStatus.Value); + } + else + { + q = q.Where(it => + it.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait + || it.UserSignContractStatus == EnumTaskUserSignContractStatus.Effect + || it.UserSignContractStatus == EnumTaskUserSignContractStatus.Stop); + } + var s = q.Select(it => new GetPersonalUserElectronSignsQueryResultItem + { + Id = it.Id, + EnterpriseName = it.Enterprise.EnterpriseName, + UserSignContractStatus = it.UserSignContractStatus, + }); + return await request.PageModel.GetPagedListAsync<GetPersonalUserElectronSignsQueryResult, GetPersonalUserElectronSignsQueryResultItem>(s, cancellationToken); + } + + /// <summary> + /// 鏌ヨ涓汉鐢ㄦ埛绛剧害璇︽儏 + /// </summary> + /// <param name="request"></param> + /// <param name="cancellationToken"></param> + /// <returns></returns> + public async Task<GetPersonalUserElectronSignQueryResult> Handle(GetPersonalUserElectronSignQuery request, CancellationToken cancellationToken) + { + var logier = JwtUtils.GetCurrentLogier(); + var q = rep.AsQueryable().AsNoTracking() + .Where(it => it.UserId == logier.Id); + if (request.Id.HasValue) + { + q = q.Where(it => it.Id == request.Id); + } + + if (request.Code.IsNotNull()) + { + q = q.Where(it => it.ContractTemplate.Code == request.Code); + } + + var model = await q.GetDetail<EnterpriseEmployee, GetPersonalUserElectronSignQueryResult>(); return model; } } -- Gitblit v1.9.1