From 2cbf894ea89cfc6af0ac2412f1967359a2819061 Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Mon, 18 Mar 2024 14:17:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=20=E4=BF=AE=E6=94=B9=E8=90=A5=E4=B8=9A?= =?UTF-8?q?=E7=82=B9=E8=BF=94=E5=9B=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj | 4 ---- .../IBusinessPlacePermissionsApi.cs | 5 +++-- Src/Dlhis.Basic.Api/Response/BusinessPlaceDto.cs | 14 ++++++++++++++ Src/Dlhis.Basic.Api/Response/GetMyResponse.cs | 13 +++++++++++++ .../BusinessPlacePermissionsController.cs | 2 +- .../BusinessPlace/Response/BusinessPlaceDto.cs | 8 ++++++++ .../BusinessPlace/Response/GetMyResponse.cs | 7 +++++++ .../Services/IBusinessPlacePermissionsService.cs | 2 +- .../Implements/BusinessPlacePermissionsService.cs | 14 ++++++++++++-- .../Dishes/Services/Implements/DishesService.cs | 3 ++- 10 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 Src/Dlhis.Basic.Api/Response/BusinessPlaceDto.cs create mode 100644 Src/Dlhis.Basic.Api/Response/GetMyResponse.cs create mode 100644 Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceDto.cs create mode 100644 Src/Dlhis.Basic/BusinessPlace/Response/GetMyResponse.cs diff --git a/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj b/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj index 2311965f..ae3784a1 100644 --- a/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj +++ b/Src/Dlhis.Basic.Api/Dlhis.Basic.Api.csproj @@ -10,8 +10,4 @@ - - - - diff --git a/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs b/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs index 6d7e32c4..3b6be007 100644 --- a/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs +++ b/Src/Dlhis.Basic.Api/IBusinessPlacePermissionsApi.cs @@ -1,4 +1,5 @@ -using Kurisu.Core.Result; +using Dlhis.Basic.Api.Response; +using Kurisu.Core.Result; using Kurisu.RemoteCall.Attributes; namespace Dlhis.Basic.Api; @@ -8,5 +9,5 @@ public interface IBusinessPlacePermissionsApi { [Auth] [Get("/api/businessplacepermissions/my")] - Task>> GetMyBussinessPlacesAsync(); + Task> GetMyAsync(); } diff --git a/Src/Dlhis.Basic.Api/Response/BusinessPlaceDto.cs b/Src/Dlhis.Basic.Api/Response/BusinessPlaceDto.cs new file mode 100644 index 00000000..cffafdb3 --- /dev/null +++ b/Src/Dlhis.Basic.Api/Response/BusinessPlaceDto.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dlhis.Basic.Api.Response +{ + public class BusinessPlaceDto + { + public Guid Code { get; set; } + public string Name { get; set; } + } +} diff --git a/Src/Dlhis.Basic.Api/Response/GetMyResponse.cs b/Src/Dlhis.Basic.Api/Response/GetMyResponse.cs new file mode 100644 index 00000000..9e2df3ee --- /dev/null +++ b/Src/Dlhis.Basic.Api/Response/GetMyResponse.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Dlhis.Basic.Api.Response +{ + public class GetMyResponse + { + public List dtos { get; set; } + } +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs index 6a1e5913..1fe322e6 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs @@ -38,7 +38,7 @@ public class BusinessPlacePermissionsController /// /// [HttpGet("my")] - public async Task> GetMy() + public async Task GetMy() { return await _businessPlacePermissionsService.GetMyAsync(); } diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceDto.cs b/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceDto.cs new file mode 100644 index 00000000..a5dd68f7 --- /dev/null +++ b/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceDto.cs @@ -0,0 +1,8 @@ +namespace Dlhis.Basic.BusinessPlace.Response +{ + public class BusinessPlaceDto + { + public Guid Code { get; set; } + public string Name { get; set; } + } +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/GetMyResponse.cs b/Src/Dlhis.Basic/BusinessPlace/Response/GetMyResponse.cs new file mode 100644 index 00000000..1a3b6fd2 --- /dev/null +++ b/Src/Dlhis.Basic/BusinessPlace/Response/GetMyResponse.cs @@ -0,0 +1,7 @@ +namespace Dlhis.Basic.BusinessPlace.Response +{ + public class GetMyResponse + { + public List dtos { get; set; } + } +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs index ee6980f4..cbae1cfc 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs @@ -10,5 +10,5 @@ public interface IBusinessPlacePermissionsService : IScopeDependency Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request); - Task> GetMyAsync(); + Task GetMyAsync(); } diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs index d8d22f27..55d1fdca 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs @@ -24,15 +24,25 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService throw new NotImplementedException(); } - public async Task> GetMyAsync() + public async Task GetMyAsync() { var userId = _currentUser.GetIntSubjectId(); - return await _dbContext.Queryable() + var guids = await _dbContext.Queryable() .Where(x => x.ManagerUserId == userId) .Select(x => x.BusinessPlaceCode) .Distinct() .ToListAsync(); + + var dtos = await _dbContext.Queryable() + .Where(x => guids.Contains(x.Code)) + .Select() + .ToListAsync(); + var myResponse = new GetMyResponse + { + dtos = dtos + }; + return myResponse; } public async Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request) diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs index e09fdeba..57835236 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs @@ -9,6 +9,7 @@ using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using Mapster; using System.Collections.Generic; +using System.Globalization; namespace Dlhis.Basic.Dishes.Services.Implements; @@ -67,7 +68,7 @@ public class DishesService : IDishesService // 读取配置中的时间 var eightThirtyPmStr = _configuration["EightThirtyPM"]; - DateTime.TryParseExact(eightThirtyPmStr, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out var dateTime); + DateTime.TryParseExact(eightThirtyPmStr, "HH:mm:ss", null, DateTimeStyles.None, out var dateTime); var payTypes = new List { BalanceRecordSourceEnumType.Cash }; if (shift.TenantId == request.Factory)