From baf350b293659b4045b43fb1ed95c027ce800a87 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 8 Apr 2024 17:00:13 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E6=88=91=E7=9A=84?= =?UTF-8?q?=E9=A4=90=E8=A1=A5=E6=8E=A5=E5=8F=A3=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MealSupplementsRecordController.cs | 11 ++++++++ .../Request/MealSupplementRecordMyRequest.cs | 16 ++++++++++++ .../Request/MealSupplementRecordRequest.cs | 12 +++++++-- .../MealSupplementRecordMyResponse.cs | 24 ++++++++++++++++++ .../Services/IMealSupplementRecordService.cs | 2 ++ .../Implements/MealSupplementRecordService.cs | 25 ++++++++++++++++++- .../Order/Controllers/BalancesController.cs | 11 -------- .../Request/BalanceRecordByUserRequest.cs | 11 -------- .../Order/Services/IBalanceService.cs | 4 --- .../Services/Implements/BalanceService.cs | 11 -------- 10 files changed, 87 insertions(+), 40 deletions(-) create mode 100644 Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordMyRequest.cs create mode 100644 Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs delete mode 100644 Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs index a56b1519..be8e5cca 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Controller/MealSupplementsRecordController.cs @@ -32,4 +32,15 @@ public class MealSupplementsRecordController { return await _mealSupplementRecordService.GetPageAsync(request); } + + /// + /// 获取我的餐补数据 + /// + /// + /// + [HttpGet("my")] + public async Task> GetMyMealSupplementRecords(MealSupplementRecordMyRequest request) + { + return await _mealSupplementRecordService.GetMyMealSupplementRecords(request); + } } diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordMyRequest.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordMyRequest.cs new file mode 100644 index 00000000..b5bf1d15 --- /dev/null +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordMyRequest.cs @@ -0,0 +1,16 @@ +using System.ComponentModel.DataAnnotations; +using Kurisu.Core.CustomClass; + +namespace Dlhis.Canteen.MealSupplementRecord.Request; + +public class MealSupplementRecordMyRequest : IValidatableObject +{ + public DateTimePeriod SearchDateTimePeriod { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1); + + yield break; + } +} diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs index a23341ab..611a4adf 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Request/MealSupplementRecordRequest.cs @@ -1,12 +1,20 @@ -using Kurisu.Core.CustomClass; +using System.ComponentModel.DataAnnotations; +using Kurisu.Core.CustomClass; using Kurisu.Core.DataAccess.Dto; namespace Dlhis.Canteen.MealSupplementRecord.Request; -public class MealSupplementRecordRequest : PageDto +public class MealSupplementRecordRequest : PageDto, IValidatableObject { /// /// 餐补日期范围 /// public DateTimePeriod DateTimePeriod { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) + { + DateTimePeriod.End = DateTimePeriod.End.Value.AddDays(1).AddSeconds(-1); + + yield break; + } } diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs new file mode 100644 index 00000000..1d2f37f1 --- /dev/null +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Response/MealSupplementRecordMyResponse.cs @@ -0,0 +1,24 @@ +using Newtonsoft.Json; + +namespace Dlhis.Canteen.MealSupplementRecord.Response; + +public class MealSupplementRecordMyResponse +{ + /// + /// 餐补日期 + /// + public DateTime Date { get; set; } + + [JsonIgnore] + public decimal CurrentAmount { get; set; } + + /// + /// 餐补金额 + /// + public string Amount => CurrentAmount.ToString("f2"); + + /// + /// 备注 + /// + public string Remark { get; set; } +} diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/IMealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/IMealSupplementRecordService.cs index 89c1624c..e02ab60e 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/IMealSupplementRecordService.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/IMealSupplementRecordService.cs @@ -7,4 +7,6 @@ namespace Dlhis.Canteen.MealSupplementRecord.Services; public interface IMealSupplementRecordService : IScopeDependency { Task> GetPageAsync(MealSupplementRecordRequest request); + + Task> GetMyMealSupplementRecords(MealSupplementRecordMyRequest request); } diff --git a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs index 69d28cd3..6f58e722 100644 --- a/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs +++ b/Src/Dlhis.Canteen/MealSupplementRecord/Services/Implements/MealSupplementRecordService.cs @@ -1,11 +1,14 @@ using Dlhis.Canteen.MealSupplementRecord.Request; using Dlhis.Canteen.MealSupplementRecord.Response; using Dlhis.Entity.Basic.Entity; +using Dlhis.Entity.Basic.Enums; using Dlhis.Entity.Canteen.Entities; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; +using Kurisu.Core.User.Abstractions; using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; +using SqlSugar; namespace Dlhis.Canteen.MealSupplementRecord.Services.Implements; @@ -13,10 +16,12 @@ public class MealSupplementRecordService : IMealSupplementRecordService { private readonly IDbContext _dbContext; + private readonly ICurrentUser _currentUser; - public MealSupplementRecordService(IDbContext dbContext) + public MealSupplementRecordService(IDbContext dbContext, ICurrentUser currentUser) { _dbContext = dbContext; + _currentUser = currentUser; } public async Task> GetPageAsync(MealSupplementRecordRequest request) @@ -44,4 +49,22 @@ public class MealSupplementRecordService : IMealSupplementRecordService return page; } + + public async Task> GetMyMealSupplementRecords(MealSupplementRecordMyRequest request) + { + var code = _currentUser.GetUserClaim("jinko-code") ?? string.Empty; + + return await _dbContext.Queryable() + .Where(x => x.Date >= request.SearchDateTimePeriod.Start && x.Date <= request.SearchDateTimePeriod.End) + .Where(x => x.Status == MealSupplementStatusEnumtype.Success) + .Where(x => x.Code == code) + .OrderBy(x => x.Date, OrderByType.Desc) + .Select(x => new MealSupplementRecordMyResponse + { + CurrentAmount = x.Amount, + Date = x.Date, + Remark = x.Remark + }) + .ToListAsync(); + } } diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index 96c6118e..c9a0ab66 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -182,15 +182,4 @@ public class BalancesController : ControllerBase { return await _balanceService.GetConsumeDeviceAsync(request); } - - /// - /// 查询餐补入账记录 - /// - /// - /// - [HttpGet("balanceOfMealSupplementRecordByUser")] - public async Task> BalanceRecordByUserAsync([FromQuery] BalanceRecordByUserRequest request) - { - return await _balanceService.GetBalanceOfMealSupplementRecordByUser(request); - } } diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs deleted file mode 100644 index dded4745..00000000 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordByUserRequest.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Canteen.Order.Request; - -public class BalanceRecordByUserRequest : PageDto -{ - /// - /// 用户档案号 - /// - public string UserNo { get; set; } -} diff --git a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs index 5d846bbc..c3290146 100644 --- a/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IBalanceService.cs @@ -2,7 +2,6 @@ using Dlhis.Canteen.Order.Request; using Dlhis.Canteen.Order.Response; using Kurisu.Core.DataAccess.Dto; -using Microsoft.AspNetCore.Mvc; namespace Dlhis.Canteen.Order.Services; @@ -33,7 +32,4 @@ public interface IBalanceService : IScopeDependency Task> AverageDailyAsync(AverageDailyRequest request); Task> GetConsumeDeviceAsync(GetConsumeDeviceRequest request); - - - Task> GetBalanceOfMealSupplementRecordByUser(BalanceRecordByUserRequest request); } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index ceb68028..3e31d242 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -747,17 +747,6 @@ public class BalanceService : IBalanceService return page; } - public async Task> GetBalanceOfMealSupplementRecordByUser(BalanceRecordByUserRequest request) - { - var page = await _dbContext.Queryable() - .Where(x => x.Source == BalanceRecordSourceEnumType.LocalTenantSubsidies || x.Source == BalanceRecordSourceEnumType.OtherTenantSubsidies) - .Where(x => x.UserNo == request.UserNo) - .Select() - .ToPageListAsync(request); - - return page; - } - /// /// 获取离线设备