From 5454e326a76e695ba4a51d5994c88ef7ded76efc Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期四, 21 八月 2025 13:24:10 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 49 insertions(+), 8 deletions(-) diff --git a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs index 8544539..71bf62f 100644 --- a/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs +++ b/FlexJobApi.UserServer.Application/EnterpriseEmployees/Commands/EnterpriseEmployeesCommandHandler.cs @@ -16,6 +16,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace FlexJobApi.UserServer.Application { @@ -23,12 +24,14 @@ /// 鐏靛伐鍛戒护澶勭悊鍣� /// </summary> public class EnterpriseEmployeesCommandHandler( - IRepository<EnterpriseEmployee> rep + IRepository<EnterpriseEmployee> rep, + IRepository<User> repUser ) : IRequestHandler<ImportEnterpriseEmployeesCommand, ImportEnterpriseEmployeesCommandResult>, IRequestHandler<EditEnterpriseEmployeeCommand, Guid> { private readonly IRepository<EnterpriseEmployee> rep = rep; + private readonly IRepository<User> repUser = repUser; /// <summary> /// 瀵煎叆鐏靛伐淇℃伅 @@ -45,6 +48,11 @@ var enterpriseEmployees = await rep.AsQueryable() .Where(it => it.EnterpriseId == logier.EnterpriseId && identities.Contains(it.Identity)) .ToListAsync(); + var userIds = enterpriseEmployees.DistinctSelect(it => it.UserId.HasValue, it => it.UserId!.Value); + var users = await repUser.AsQueryable() + .Where(it => userIds.Contains(it.Id)) + .ToListAsync(); + var successList = new List<ImportEnterpriseEmployeesCommandModel>(); foreach (var model in models) { var errors = new List<string>(); @@ -68,7 +76,7 @@ { errors.Add("韬唤璇佸彿鏍煎紡涓嶆纭�"); } - else if (models.Any(it => it.Identity == model.Identity)) + else if (successList.Any(it => it.Identity == model.Identity)) { errors.Add("韬唤璇佸彿閲嶅"); } @@ -95,14 +103,31 @@ Age = model.Age, }; await rep.InsertAsync(enterpriseEmployee); + successList.Add(model); } else { + var canUpdate = true; if (enterpriseEmployee.UserId.HasValue) { - errors.Add("璇ョ伒宸ュ凡鎶ュ悕鏃犳硶淇敼淇℃伅"); + var user = users.FirstOrDefault(it => it.Id == enterpriseEmployee.UserId.Value)!; + if (user.IsReal == true) + { + canUpdate = false; + errors.Add("宸插疄鍚嶆棤娉曚慨鏀逛俊鎭�"); + } + else + { + user.Name = model.Name; + user.ContactPhoneNumber = model.ContactPhoneNumber; + user.Identity = model.Identity; + user.Gender = model.Gender; + user.Birthday = model.Birthday; + user.Age = model.Age; + await repUser.UpdateAsync(user); + } } - else + if (canUpdate) { enterpriseEmployee.Name = model.Name; enterpriseEmployee.ContactPhoneNumber = model.ContactPhoneNumber; @@ -110,6 +135,7 @@ enterpriseEmployee.Birthday = model.Birthday; enterpriseEmployee.Age = model.Age; await rep.UpdateAsync(enterpriseEmployee); + successList.Add(model); } } } @@ -132,21 +158,36 @@ /// <param name="request"></param> /// <param name="cancellationToken"></param> /// <returns></returns> - public Task<Guid> Handle(EditEnterpriseEmployeeCommand request, CancellationToken cancellationToken) + public async Task<Guid> Handle(EditEnterpriseEmployeeCommand request, CancellationToken cancellationToken) { var logier = JwtUtils.GetCurrentLogier(); - return request.SaveData<EnterpriseEmployee, EditEnterpriseEmployeeCommand>( + var entity = await request.SaveData<EnterpriseEmployee, EditEnterpriseEmployeeCommand>( q => q.Where(it => it.EnterpriseId == logier.EnterpriseId), it => it.EnterpriseId == logier.EnterpriseId && it.Id != request.Id && it.Identity == request.Identity, - (entity) => + (entity) => { if (request.Id.HasValue && entity.UserId.HasValue) { - throw Oops.Oh(EnumErrorCodeType.s510, "璇ョ伒宸ュ凡鎶ュ悕鏃犳硶淇敼淇℃伅"); + var user = repUser.AsQueryable().FirstOrDefault(it => it.Id == entity.UserId.Value); + if (user!.IsReal == true) + { + throw Oops.Oh(EnumErrorCodeType.s510, "宸插疄鍚嶆棤娉曚慨鏀逛俊鎭�"); + } + else + { + user.Name = request.Name; + user.ContactPhoneNumber = request.ContactPhoneNumber; + user.Identity = request.Identity; + user.Birthday = request.Identity.GetBirthday(); + user.Gender = request.Gender; + user.Age = request.Age; + repUser.Update(user); + } } request.Adapt(entity); }, cancellationToken); + return entity.Id; } } } -- Gitblit v1.9.1