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

fix 消费明细分页调整

Browse Source
This commit is contained in:
liguoyang
2024-04-08 18:09:46 +08:00
parent c5e8de6114
commit 3d136b13bf
9 changed files with 207 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
using Dlhis.Canteen.Dishes.Request;
using Dlhis.Basic.Api;
using Dlhis.Canteen.Dishes.Request;
using Dlhis.Canteen.Order.Request;
using Dlhis.Canteen.Order.Response;
using Dlhis.Entity.Basic.Entity;
@@ -22,15 +23,18 @@ public class BalanceService : IBalanceService
{
private readonly IDbContext _dbContext;
private readonly ICurrentUser _currentUser;
private readonly ILogger<BalanceService> _logger;
private readonly ITenantApi _tenantApi;
private readonly IBusinessPlacePermissionsApi _businessPlacePermissionsApi;
public BalanceService(IDbContext dbContext, ICurrentUser currentUser, ILogger<BalanceService> logger, ITenantApi tenantApi)
public BalanceService(IDbContext dbContext,
ICurrentUser currentUser,
ITenantApi tenantApi,
IBusinessPlacePermissionsApi businessPlacePermissionsApi)
{
_dbContext = dbContext;
_currentUser = currentUser;
_logger = logger;
_tenantApi = tenantApi;
_businessPlacePermissionsApi = businessPlacePermissionsApi;
}
public async Task<Pagination<BalanceRecordResponse>> GetPageAsync(BalanceRecordPageRequest request)
@@ -181,56 +185,55 @@ public class BalanceService : IBalanceService
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<Pagination<BalanceRecordResponse>> RecordPageDetailsAsync(BalanceRecordPageDetailsRequest request)
public async Task<Pagination<BalanceRecordDetailPageResponse>> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request)
{
var paeginfo = await _dbContext.Queryable<BalanceRecordEntity>()
var myCodes = (await _businessPlacePermissionsApi.GetMyAsync()).Data.Select(x => (Guid?)x.Code).ToList();
var page = await _dbContext.Queryable<BalanceRecordEntity>()
.LeftJoin<DepartmentEntity>((record, department) => record.DepartmentNo == department.No)
.LeftJoin<BusinessPlaceEntity>((record, department, bplace) => record.BusinessPlaceCode == bplace.Code)
.LeftJoin<BusinessShiftEntity>((record, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code)
.LeftJoin<BasicTypeEntity>((record, department, bplace, bshift, type) => record.BusinessShiftCode.ToString() == type.Code)
.WhereIF(!request.Name.IsEmpty(), record => record.Name == request.Name)
.WhereIF(!request.DepartmentNo.IsEmpty(), record => record.DepartmentNo == request.DepartmentNo)
.WhereIF(!request.UserCode.IsEmpty(), record => record.UserCode == request.UserCode)
.WhereIF(request.Type.HasValue, record => record.Type == request.Type)
.WhereIF(request.BusinessShiftCode.HasValue, record => record.BusinessShiftCode == request.BusinessShiftCode)
.WhereIF(request.BusinessPlaceCode.HasValue, record => record.BusinessPlaceCode == request.BusinessPlaceCode)
.WhereIF(request.StartDatetime.HasValue, record => record.CostDateTime >= request.StartDatetime)
.WhereIF(request.EndDatetime.HasValue, record => record.CostDateTime <= request.EndDatetime)
.WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Name)
.OrderBy(record => record.CreateTime, OrderByType.Desc)
.Select((record, department, bplace, bshift, type) => new BalanceRecordResponse
.LeftJoin<GainfoEntity>((record, department, bplace, gainfo) => record.UserNo == gainfo.No)
.Where((record) => myCodes.Contains(record.BusinessPlaceCode))
.Where((record) => record.Type == BalanceRecordTypeEnumType.Out)
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDateTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search)
.OrderBy(record => record.CostDateTime, OrderByType.Desc)
.Select((record, department, bplace, gainfo) => new BalanceRecordDetailPageResponse
{
Id = record.Id,
Amount = record.Amount,
BusinessPlaceCode = record.BusinessPlaceCode,
BusinessShiftCode = record.BusinessShiftCode,
No = record.No,
CurrentAmount = record.Amount,
CostDate = record.CostDate,
CostId = record.CostId,
DepartmentNo = record.DepartmentNo,
DeviceInfo = record.DeviceUniqueNo,
IP = record.IP,
UserNo = record.UserNo,
UserCode = record.UserCode,
Type = record.Type,
SubsidiesFromMonth = record.SubsidiesFromMonth,
Status = record.Status,
Source = record.Source,
No = record.No,
IsCostCrossTenant = record.IsCostCrossTenant,
OriginTenantId = record.OriginTenantId,
Name = record.Name,
UserName = record.Name,
DepartmentName = department.Name,
BusinessPlaceName = bplace.Name,
BusinessShiftName = type.Display,
CostDateTime = record.CreateTime // todo
CostDateTime = record.CostDateTime,
ShiftType = record.ShiftType,
Werks = gainfo.Werks,
Factory = record.TenantId,
Remark = record.Remark,
})
.ToPageListAsync(request);
foreach (var item in paeginfo.Data)
try
{
item.Amount = Math.Abs(item.Amount);
var tenantResult = await _tenantApi.GetTenantsInternalAsync();
var tenants = tenantResult.Data;
page.Data.ForEach(item =>
{
item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name;
});
}
return paeginfo;
catch (Exception)
{
}
return page;
}
/// <summary>
/// 消费汇总 根据部门号