Browse Source

单位分组

bjmzak
wxd 2 years ago
parent
commit
60610cf9f2
  1. 5
      src/Shentun.Peis.Application.Contracts/CustomerOrgGroups/CustomerOrgGroupDto.cs
  2. 17
      src/Shentun.Peis.Application/CustomerOrgGroups/CustomerOrgGroupAppService.cs

5
src/Shentun.Peis.Application.Contracts/CustomerOrgGroups/CustomerOrgGroupDto.cs

@ -65,5 +65,10 @@ namespace Shentun.Peis.CustomerOrgGroups
/// 显示顺序 /// 显示顺序
/// </summary> /// </summary>
public int DisplayOrder { get; set; } public int DisplayOrder { get; set; }
/// <summary>
/// 体检次数ID
/// </summary>
public Guid CustomerOrgRegisterId { get; set; }
} }
} }

17
src/Shentun.Peis.Application/CustomerOrgGroups/CustomerOrgGroupAppService.cs

@ -53,7 +53,14 @@ namespace Shentun.Peis.CustomerOrgGroups
/// <returns></returns> /// <returns></returns>
public override async Task<CustomerOrgGroupDto> GetAsync(Guid id) public override async Task<CustomerOrgGroupDto> GetAsync(Guid id)
{ {
return await base.GetAsync(id);
var userList = await _userRepository.GetListAsync();
var entityDto = await base.GetAsync(id);
entityDto.CreatorName = EntityHelper.GetUserNameNoSql(userList, entityDto.CreatorId);
entityDto.LastModifierName = EntityHelper.GetUserNameNoSql(userList, entityDto.CreatorId);
return entityDto;
} }
/// <summary> /// <summary>
/// 获取列表 团检分组 /// 获取列表 团检分组
@ -125,7 +132,8 @@ namespace Shentun.Peis.CustomerOrgGroups
LastModifierName = EntityHelper.GetUserNameNoSql(userList, s.LastModifierId), LastModifierName = EntityHelper.GetUserNameNoSql(userList, s.LastModifierId),
CustomerOrgId = s.CustomerOrgRegister.CustomerOrgId, CustomerOrgId = s.CustomerOrgRegister.CustomerOrgId,
CustomerOrgName = s.CustomerOrgRegister.CustomerOrg.DisplayName, CustomerOrgName = s.CustomerOrgRegister.CustomerOrg.DisplayName,
MedicalTimes = s.CustomerOrgRegister.MedicalTimes
MedicalTimes = s.CustomerOrgRegister.MedicalTimes,
CustomerOrgRegisterId = s.CustomerOrgRegisterId
}).ToList(); }).ToList();
return new PagedResultDto<CustomerOrgGroupOrCustomerOrgDto>(totalCount, entdto); return new PagedResultDto<CustomerOrgGroupOrCustomerOrgDto>(totalCount, entdto);
@ -143,7 +151,7 @@ namespace Shentun.Peis.CustomerOrgGroups
[HttpPost("api/customerorggroup/createcustomerorggroupincustomerorgregister")] [HttpPost("api/customerorggroup/createcustomerorggroupincustomerorgregister")]
public async Task<CustomerOrgGroupDto> CreateCustomerOrgGroupInCustomerOrgRegisterAsync(CreateCustomerOrgGroupInCustomerOrgRegisterDto input) public async Task<CustomerOrgGroupDto> CreateCustomerOrgGroupInCustomerOrgRegisterAsync(CreateCustomerOrgGroupInCustomerOrgRegisterDto input)
{ {
var createEntity = ObjectMapper.Map<CreateCustomerOrgGroupDto, CustomerOrgGroup>(input); var createEntity = ObjectMapper.Map<CreateCustomerOrgGroupDto, CustomerOrgGroup>(input);
var entity = await _manager.CreateAsync(input.IsMaxMedicalTimes, input.CustomerOrgRegisterId, input.CustomerOrgId, createEntity); var entity = await _manager.CreateAsync(input.IsMaxMedicalTimes, input.CustomerOrgRegisterId, input.CustomerOrgId, createEntity);
@ -249,7 +257,8 @@ namespace Shentun.Peis.CustomerOrgGroups
AgeUpperLimit = s.AgeUpperLimit, AgeUpperLimit = s.AgeUpperLimit,
AgeLowerLimit = s.AgeLowerLimit, AgeLowerLimit = s.AgeLowerLimit,
CreatorName = EntityHelper.GetUserNameNoSql(userList, s.CreatorId), CreatorName = EntityHelper.GetUserNameNoSql(userList, s.CreatorId),
LastModifierName = EntityHelper.GetUserNameNoSql(userList, s.LastModifierId)
LastModifierName = EntityHelper.GetUserNameNoSql(userList, s.LastModifierId),
CustomerOrgRegisterId = CustomerOrgRegisterId
}).ToList(); }).ToList();
return entdto; return entdto;

Loading…
Cancel
Save