From c9c2de80b709c1fc109e1d5a6e7b2257cd5d25a3 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 10 Jan 2024 17:11:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=8E=B7=E5=8F=96=E9=A4=90=E5=88=AB?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E5=9C=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Response/BusinessPlaceWithShiftResponse.cs      | 10 ++++++++++
 .../Implements/BusinessPlaceShiftService.cs         | 13 ++++++++++++-
 Src/Dlhis.User.Api/ITenantApi.cs                    |  3 +++
 .../Identity/Controllers/TenantsController.cs       | 12 ++++++++++++
 Src/Dlhis.User/Identity/Services/ITenantService.cs  |  2 ++
 .../Identity/Services/Implements/TenantService.cs   |  8 ++++++++
 6 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceWithShiftResponse.cs b/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceWithShiftResponse.cs
index 6b5374f5..9e346027 100644
--- a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceWithShiftResponse.cs
+++ b/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceWithShiftResponse.cs
@@ -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>
diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
index 4ed9e149..7286e3b2 100644
--- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
@@ -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,
diff --git a/Src/Dlhis.User.Api/ITenantApi.cs b/Src/Dlhis.User.Api/ITenantApi.cs
index 2a27136e..72be9696 100644
--- a/Src/Dlhis.User.Api/ITenantApi.cs
+++ b/Src/Dlhis.User.Api/ITenantApi.cs
@@ -11,4 +11,7 @@ public interface ITenantApi
     [Auth]
     [Get("/api/tenants/list")]
     Task<DefaultApiResult<List<TenantResponse>>> GetTenantsAsync();
+
+    [Get("/api/tenants/single")]
+    Task<DefaultApiResult<TenantResponse>> GetTenantByCodeAsync(string code);
 }
diff --git a/Src/Dlhis.User/Identity/Controllers/TenantsController.cs b/Src/Dlhis.User/Identity/Controllers/TenantsController.cs
index 52b02d55..c5228734 100644
--- a/Src/Dlhis.User/Identity/Controllers/TenantsController.cs
+++ b/Src/Dlhis.User/Identity/Controllers/TenantsController.cs
@@ -39,4 +39,16 @@ public class TenantsController : ControllerBase
     {
         return await _tenantService.GetListAsync();
     }
+
+    /// <summary>
+    /// 获取租户
+    /// </summary>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpGet("single")]
+    public async Task<TenantResponse> GetTenantByCode(string code)
+    {
+        return await _tenantService.GetTenantByCode(code);
+    }
+    
 }
diff --git a/Src/Dlhis.User/Identity/Services/ITenantService.cs b/Src/Dlhis.User/Identity/Services/ITenantService.cs
index 72c4bd87..1edb801e 100644
--- a/Src/Dlhis.User/Identity/Services/ITenantService.cs
+++ b/Src/Dlhis.User/Identity/Services/ITenantService.cs
@@ -9,4 +9,6 @@ public interface ITenantService : IScopeDependency
     Task<Pagination<TenantResponse>> GetPageAsync(TenantPageRequest request);
 
     Task<List<TenantResponse>> GetListAsync();
+
+    Task<TenantResponse> GetTenantByCode(string code);
 }
diff --git a/Src/Dlhis.User/Identity/Services/Implements/TenantService.cs b/Src/Dlhis.User/Identity/Services/Implements/TenantService.cs
index a6ec9b54..43be5531 100644
--- a/Src/Dlhis.User/Identity/Services/Implements/TenantService.cs
+++ b/Src/Dlhis.User/Identity/Services/Implements/TenantService.cs
@@ -31,4 +31,12 @@ public class TenantService : ITenantService
                .Select<TenantResponse>()
                .ToListAsync();
     }
+
+    public async Task<TenantResponse> GetTenantByCode(string code)
+    {
+        return await _dbContext.Queryable<TenantEntity>()
+            .Where(x => x.Code == code)
+            .Select<TenantResponse>()
+            .FirstAsync();
+    }
 }