fix 获取餐别增加基地信息

This commit is contained in:
2024-01-10 17:11:36 +08:00
parent 5915264df9
commit c9c2de80b7
6 changed files with 47 additions and 1 deletions

View File

@@ -14,6 +14,16 @@ public class BusinessPlaceWithShiftResponse
/// </summary>
public string Name { get; set; }
/// <summary>
/// 基地/租户code
/// </summary>
public string TenantCode { get; set; }
/// <summary>
/// 基地/租户名称
/// </summary>
public string TenantName { get; set; }
/// <summary>
/// 餐次
/// </summary>

View File

@@ -2,9 +2,12 @@
using Dlhis.Basic.BusinessShift.Request;
using Dlhis.Basic.BusinessShift.Response;
using Dlhis.Entity.Basic.Entity;
using Dlhis.User.Api;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.CustomClass;
using Kurisu.Core.DataAccess.Dto;
using Kurisu.Core.Result;
using Kurisu.Core.User.Abstractions;
using Kurisu.SqlSugar.Attributes;
using Kurisu.SqlSugar.Extensions;
using Kurisu.SqlSugar.Services;
@@ -15,10 +18,12 @@ namespace Dlhis.Basic.BusinessShift.Services.Implements;
public class BusinessPlaceShiftService : IBusinessPlaceShiftService
{
private readonly IDbContext _dbContext;
private readonly ITenantApi _tenantApi;
public BusinessPlaceShiftService(IDbContext dbContext)
public BusinessPlaceShiftService(IDbContext dbContext, ITenantApi tenantApi)
{
_dbContext = dbContext;
_tenantApi = tenantApi;
}
public async Task<Pagination<BusinessPlaceShiftResponse>> GetPageAsync(BusinessPlaceShiftPageRequest request)
@@ -86,10 +91,16 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
.OrderBy(x => x.Sequence) //排序
.ToListAsync();
var tenantResult = await _tenantApi.GetTenantByCodeAsync(place.TenantId);
(tenantResult.Code == ApiStateCode.Success).ThrowIfFalse(tenantResult.Msg);
var tenantInfo = tenantResult.Data;
return new BusinessPlaceWithShiftResponse
{
CustomCode = placeCustomCode,
Name = place.Name,
TenantCode = tenantInfo.Code,
TenantName = tenantInfo.Name,
Shifts = shifts.Select(shift => new BusinessPlaceShiftTinyResponse
{
CustomCode = shift.CustomCode,