From 0fa8cba30a713521e4d3178bea424051bffbdeb1 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 22 Jan 2024 10:48:18 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Request/BusinessPlaceShiftSaveRequest.cs | 3 +- .../Services/Implements/BalanceService.cs | 52 ++++++++++--------- 2 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveRequest.cs b/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveRequest.cs index 0dc1b4cf..8353c298 100644 --- a/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveRequest.cs +++ b/Src/Dlhis.Basic/BusinessShift/Request/BusinessPlaceShiftSaveRequest.cs @@ -14,8 +14,9 @@ public class BusinessPlaceShiftSaveRequest : IValidatableObject public Guid BusinessPlaceCode { get; set; } /// - /// 自定义代号 + /// 自定义代号 mealshift /// + [Required(ErrorMessage = "餐次编号不能为空")] public string CustomCode { get; set; } /// diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 96dd2567..16eab682 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -170,16 +170,15 @@ public class BalanceService : IBalanceService /// public async Task> BalanceRecordSummaryByNoAsync(BalanceRecordSummaryRequest request) { - var shiftCodeDict = await GetShiftCode(); var paeginfos = await _dbContext.Queryable() .WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo) - .WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode) + .WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode) .WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId) - .WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime) - .WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime) - .Where(record => record.CostId == request.CostId && record.Amount < 0) + .WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime) + .WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime) + .Where(record => record.CostId == request.CostId && record.Type == BalanceRecordTypeEnumType.Out) .OrderBy(record => record.CreateTime, OrderByType.Desc) .ToListAsync(); @@ -246,7 +245,7 @@ public class BalanceService : IBalanceService .WhereIF(!request.OriginTenantId.IsEmpty(), record => record.TenantId == request.OriginTenantId) .WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime) .WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime) - .Where(record => record.CostId == request.CostId && record.Amount < 0) + .Where(record => record.CostId == request.CostId && record.Type == BalanceRecordTypeEnumType.Out) .OrderBy(record => record.CreateTime, OrderByType.Desc) .ToListAsync(); @@ -294,24 +293,7 @@ public class BalanceService : IBalanceService return lst; } - private async Task> GetShiftCode() - { - var list = await _dbContext.Queryable().ToListAsync(); - var shiftCodeDict = new Dictionary(); - - var breakfastCode = list.FirstOrDefault(x => x.Display == "早餐")?.Code; - var lunchCode = list.FirstOrDefault(x => x.Display == "午餐")?.Code; - var dinnerCode = list.FirstOrDefault(x => x.Display == "晚餐")?.Code; - var lateNightCode = list.FirstOrDefault(x => x.Display == "宵夜")?.Code; - - shiftCodeDict.Add("Breakfast", breakfastCode); - shiftCodeDict.Add("Lunch", lunchCode); - shiftCodeDict.Add("Dinner", dinnerCode); - shiftCodeDict.Add("LateNight", lateNightCode); - - return shiftCodeDict; - } /// @@ -328,7 +310,8 @@ public class BalanceService : IBalanceService .WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime) .WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime) .WhereIF(request.BusinessPlaceCode.HasValue, record => record.BusinessPlaceCode == request.BusinessPlaceCode) - .Where(record => record.Amount < 0).ToListAsync(); + .Where(record => record.Type == BalanceRecordTypeEnumType.Out) + .ToListAsync(); var lst = new List(); foreach (var first in pageinfo.GroupBy(record => record.CostDateTime.ToString("yyyy-MM-dd"))) @@ -491,6 +474,7 @@ public class BalanceService : IBalanceService if (effect <= 0) throw new VersionExceptions("更新版本冲突"); await _dbContext.UpdateAsync(balanceRecord); + }, 5); } @@ -518,4 +502,24 @@ public class BalanceService : IBalanceService throw new UserFriendlyException("操作失败,请重试"); } + + + private async Task> GetShiftCode() + { + var list = await _dbContext.Queryable().Where(x => x.Type == "mealshift").ToListAsync(); + + var shiftCodeDict = new Dictionary(); + + var breakfastCode = list.FirstOrDefault(x => x.Code == "shift-breakfast")?.Code; + var lunchCode = list.FirstOrDefault(x => x.Code == "shift-lunch")?.Code; + var dinnerCode = list.FirstOrDefault(x => x.Code == "shift-dinner")?.Code; + var lateNightCode = list.FirstOrDefault(x => x.Code == "shift-midnightsnack")?.Code; + + shiftCodeDict.Add("Breakfast", breakfastCode); + shiftCodeDict.Add("Lunch", lunchCode); + shiftCodeDict.Add("Dinner", dinnerCode); + shiftCodeDict.Add("LateNight", lateNightCode); + + return shiftCodeDict; + } }