fix 统计,消费明细

Src/Dlhis.Canteen/EMealVoucher/Controllers/EMealVoucherController.cs

@@ -1,7 +1,10 @@
 using Dlhis.Canteen.EMealVoucher.Request;
 using Dlhis.Canteen.EMealVoucher.Response;
 using Dlhis.Canteen.EMealVoucher.Services;
+using Dlhis.Canteen.Order.Request;
+using Dlhis.Canteen.Order.Response;
 using Kurisu.AspNetCore.DataAccess.Dto;
+using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -73,4 +76,16 @@ public class EMealVoucherController : ControllerBase
     {
         return await _eMealVoucherService.GetQrCodeAsync(signature);
     }
+
+    /// <summary>
+    /// 餐券消费分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("balance/page")]
+    [IgnoreTenant]
+    public async Task<Pagination<BalanceRecordEMealVoucherResponse>> GetEMealVoucherPageAsync([FromQuery] BalanceRecordEMealVoucherPageRequest request)
+    {
+        return await _eMealVoucherService.GetEMealVoucherPageAsync(request);
+    }
 }

Src/Dlhis.Canteen/EMealVoucher/Services/IEMealVoucherService.cs

@@ -1,6 +1,9 @@
 using Dlhis.Canteen.EMealVoucher.Request;
 using Dlhis.Canteen.EMealVoucher.Response;
+using Dlhis.Canteen.Order.Request;
+using Dlhis.Canteen.Order.Response;
 using Kurisu.AspNetCore.DataAccess.Dto;
+using Microsoft.AspNetCore.Mvc;
 
 namespace Dlhis.Canteen.EMealVoucher.Services;
 
@@ -15,4 +18,6 @@ public interface IEMealVoucherService : IScopeDependency
     Task RefreshSignatureAsync(long detailId);
 
     Task<string> GetQrCodeAsync(string signature);
+
+    Task<Pagination<BalanceRecordEMealVoucherResponse>> GetEMealVoucherPageAsync([FromQuery] BalanceRecordEMealVoucherPageRequest request);
 }

Src/Dlhis.Canteen/EMealVoucher/Services/Implements/EMealVoucherService.cs

@@ -1,8 +1,13 @@
 using System.Text;
 using Dlhis.Canteen.EMealVoucher.Request;
 using Dlhis.Canteen.EMealVoucher.Response;
+using Dlhis.Canteen.Order.Request;
+using Dlhis.Canteen.Order.Response;
+using Dlhis.Entity.Basic.Entity;
 using Dlhis.Entity.Canteen.Entities;
+using Dlhis.Entity.Canteen.Enums;
 using Kurisu.AspNetCore.Authentication.Abstractions;
+using Kurisu.AspNetCore.CustomClass;
 using Kurisu.AspNetCore.DataAccess.Dto;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
@@ -103,4 +108,42 @@ public class EMealVoucherService : IEMealVoucherService
 
         return qrCode;
     }
+
+    /// <inheritdoc />
+    public async Task<Pagination<BalanceRecordEMealVoucherResponse>> GetEMealVoucherPageAsync(BalanceRecordEMealVoucherPageRequest request)
+    {
+        var tenantId = _currentUser.GetStringTenantId();
+
+        return await _dbContext.Queryable<BalanceRecordEntity>()
+            .LeftJoin<BusinessPlaceEntity>((x, bPlace) => x.BusinessPlaceCode == bPlace.Code)
+            .LeftJoin<DepartmentEntity>((x, bPlace, department) => x.DepartmentNo == department.No)
+            .Where(x => x.Status == BalanceRecordStatusEnumType.Valid && x.Type == BalanceRecordTypeEnumType.Out) //有效,消费数据
+            .WhereIF(request.SearchDateTimePeriod.HasValue(), x => x.CostDate >= request.SearchDateTimePeriod.Start && x.CostDate <= request.SearchDateTimePeriod.End) //成本日期
+            .Where(x => x.Source == BalanceRecordSourceEnumType.EMealVoucher)
+            .Where(x => SqlFunc.Subqueryable<EMealVoucherEntity>().Where(p => p.Factory == tenantId).Where(p => p.Code == x.UserCode).Any() || x.TenantId == tenantId)
+            .Select((x, bPlace, department) => new BalanceRecordEMealVoucherResponse
+            {
+                No = x.No,
+                UserNo = x.UserNo,
+                Name = x.Name,
+                UserCode = x.UserCode,
+                DepartmentNo = x.DepartmentNo,
+                DepartmentName = department.Name,
+                CostDate = x.CostDate,
+                Remark = x.Remark,
+                Source = x.Source,
+                Type = x.Type,
+                Amount = SqlFunc.Abs(x.Amount),
+                BusinessPlaceName = bPlace.Name,
+                ShiftType = x.ShiftType,
+                DeviceInfo = x.DeviceUniqueNo,
+                CostId = x.CostId,
+                OriginTenantId = x.OriginTenantId,
+                Status = x.Status,
+                CostDateTime = x.CostDateTime,
+                Factory = x.TenantId,
+                Werks = x.Werks
+            })
+            .ToPageListAsync(request);
+    }
 }