diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs index abb8d969..8e13109e 100644 --- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs +++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs @@ -90,6 +90,7 @@ public class BalancesController : ControllerBase /// /// /// + [Authorize(Roles = "admin,tenant-admin")] [HttpPost("obsoluteOutRecord")] [Transactional] public async Task ObsoluteAsync(BalanceRecordObsoluteRequest request) diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs index e9e6ccb6..f938e46e 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordAnalysisRespones.cs @@ -1,35 +1,34 @@ -namespace Dlhis.Canteen.Order.Response +namespace Dlhis.Canteen.Order.Response; + +public class BalanceRecordAnalysisRespones { - public class BalanceRecordAnalysisRespones - { - /// - /// 消费日期 - /// - public DateOnly CostDate { get; set; } + /// + /// 消费日期 + /// + public DateOnly CostDate { get; set; } - /// - /// 早餐人数 - /// - public int BreakfastNumberOfPeople { get; set; } + /// + /// 早餐人数 + /// + public int BreakfastNumberOfPeople { get; set; } - /// - /// 午餐人数 - /// - public int LunchNumberOfPeople { get; set; } + /// + /// 午餐人数 + /// + public int LunchNumberOfPeople { get; set; } - /// - /// 晚餐人数 - /// - public int DinnerNumberOfPeople { get; set; } + /// + /// 晚餐人数 + /// + public int DinnerNumberOfPeople { get; set; } - /// - /// 宵夜人数 - /// - public int LateNightNumberOfPeople { get; set; } + /// + /// 宵夜人数 + /// + public int LateNightNumberOfPeople { get; set; } - /// - /// 总人数 - /// - public int TotalNumberOfPeople { get; set; } - } + /// + /// 总人数 + /// + public int TotalNumberOfPeople { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index f07ad2b4..6134e9bd 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -82,6 +82,7 @@ public class BalanceService : IBalanceService TenantId = record.TenantId, }) .ToPageListAsync(request); + page.Data.ForEach(item => { item.Amount = Math.Abs(item.Amount); @@ -414,7 +415,7 @@ public class BalanceService : IBalanceService //每个餐次人数 BreakfastNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Breakfast).Select(x => x.UserNo).Distinct().Count(), LunchNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(), - DinnerNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Lunch).Select(x => x.UserNo).Distinct().Count(), + DinnerNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Dinner).Select(x => x.UserNo).Distinct().Count(), LateNightNumberOfPeople = first.Where(x => x.ShiftType == ShiftEnumType.Nightsnack).Select(x => x.UserNo).Distinct().Count(), TotalNumberOfPeople = first.Where(x => x.CostDate.ToString("yyyy-MM-dd") == first.Key).Select(x => x.UserNo).Distinct().Count() @@ -532,7 +533,7 @@ public class BalanceService : IBalanceService .Select((record, ga, department, bplace) => new BalanceRecordUserPageResponse { Id = record.Id, - CurrentAmount = record.Amount, + CurrentAmount = SqlFunc.Abs(record.Amount), Source = record.Source, No = record.No, BusinessPlaceName = bplace.Name, @@ -549,6 +550,7 @@ public class BalanceService : IBalanceService var monthSum = await _dbContext.Queryable() .Where(x => x.CostDateTime >= monthStart && x.CostDateTime <= monthEnd) .Where(x => x.Type == BalanceRecordTypeEnumType.Out) + .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) .Where(x => x.UserCode == jinkoCode) .SumAsync(x => SqlFunc.Abs(x.Amount));