yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat 营业点消费明细导出

Browse Source
This commit is contained in:
liguoyang
2025-04-21 11:23:36 +08:00
parent d5aeb80af9
commit 3a67e0b030
6 changed files with 108 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs
View File

@@ -112,7 +112,7 @@ public class BalanceService : IBalanceService
/// <inheritdoc />
public async Task<List<BalanceRecordResponse>> GetPageToExportAsync(BalanceRecordPageRequest request)
{
var rows = await _dbContext.Queryable<BalanceRecordEntity>()
var rows = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
@@ -352,6 +352,61 @@ public class BalanceService : IBalanceService
}
public async Task<List<BalanceRecordDetailPageResponse>> RecordPageDetailsToExportAsync(BalanceRecordPageDetailRequest request)
{
var myCodes = (await _businessPlacePermissionsApi.GetMyAsync()).Select(x => (Guid?)x.Code).ToList();
if (request.BusinessplaceCodes.IsPresent())
{
myCodes = myCodes.Where(x => request.BusinessplaceCodes.Contains(x)).ToList();
}
//var myCodes = request.BusinessplaceCodes;
var queryable = _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bPlace) => record.BusinessPlaceCode == bPlace.Code)
.WhereIF(request.SearchDateTimePeriod.HasValue(), record => record.CostDate >= request.SearchDateTimePeriod.Start && record.CostDate <= request.SearchDateTimePeriod.End)
.Where(record => record.Type == BalanceRecordTypeEnumType.Out && record.Status == BalanceRecordStatusEnumType.Valid)
.Where(record => myCodes.Contains(record.BusinessPlaceCode))
.WhereIF(request.ShiftType.HasValue, record => record.ShiftType == request.ShiftType)
.WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search);
var rows = await queryable
.OrderBy(record => new { CostDate = SqlFunc.Desc(record.CostDate), CostDateTime = SqlFunc.Desc(record.CostDateTime) })
.Select((record, department, bPlace) => new BalanceRecordDetailPageResponse
{
Id = record.Id,
No = record.No,
CurrentAmount = SqlFunc.Abs(record.Amount),
CostDate = record.CostDate,
UserNo = record.UserNo,
UserCode = record.UserCode,
Source = record.Source,
UserName = record.Name,
DepartmentName = department.Name,
BusinessPlaceName = bPlace.Name,
CostDateTime = record.CostDateTime,
ShiftType = record.ShiftType,
Werks = record.Werks,
Factory = record.TenantId,
Remark = record.Remark,
})
.ToListAsync();
try
{
var tenants = await _tenantApi.GetTenantsInternalAsync();
rows.ForEach(item => { item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name; });
}
catch (Exception)
{
//ignore
}
return rows;
}
public async Task SupplementBalanceAsync(BalanceSupplementRequest request)
{
var balanceInfo = await _dbContext.Queryable<BalanceRecordEntity>().Where(x => x.No == request.No).SingleAsync();