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

22
Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
View File

@@ -37,6 +37,18 @@ public class BalancesController : ControllerBase
return await _balanceService.GetPageAsync(request);
}
/// <summary>
/// 消费明细
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("recordPageDetails")]
public async Task<Pagination<BalanceRecordDetailPageResponse>> RecordPageDetailsAsync([FromQuery] BalanceRecordPageDetailRequest request)
{
return await _balanceService.RecordPageDetailsAsync(request);
}
/// <summary>
/// 设备消费记录
/// </summary>
@@ -96,16 +108,6 @@ public class BalancesController : ControllerBase
return await _balanceService.RecordByCostIdAsync(request);
}
/// <summary>
/// 消费明细
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("recordPageDetails")]
public async Task<Pagination<BalanceRecordResponse>> RecordPageDetailsAsync([FromQuery] BalanceRecordPageDetailsRequest request)
{
return await _balanceService.RecordPageDetailsAsync(request);
}
/// <summary>
/// 消费汇总 根据部门号

26
Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailRequest.cs Normal file
View File

@@ -0,0 +1,26 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.Core.CustomClass;
using Kurisu.Core.DataAccess.Dto;
namespace Dlhis.Canteen.Order.Request;
public class BalanceRecordPageDetailRequest : PageDto, IValidatableObject
{
/// <summary>
/// 查询时间范围
/// </summary>
public DateTimePeriod SearchDateTimePeriod { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (SearchDateTimePeriod != null)
{
if (SearchDateTimePeriod.End.HasValue)
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
}
}
yield break;
}
}

52
Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailsRequest.cs
View File

@@ -1,52 +0,0 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.Core.DataAccess.Dto;
using SqlSugar;
using SqlSugar.DbConvert;
using System.ComponentModel.DataAnnotations;
namespace Dlhis.Canteen.Dishes.Request
{
public class BalanceRecordPageDetailsRequest : PageDto
{
/// <summary>
/// 姓名
/// </summary>
public string Name { get; set; }
/// <summary>
/// 部门号
/// </summary>
public string DepartmentNo { get; set; }
/// <summary>
/// 学工号
/// </summary>
public string UserCode { get; set; }
/// <summary>
/// 收入/支出
/// </summary>
[EnumDataType(typeof(BalanceRecordTypeEnumType))]
public BalanceRecordTypeEnumType? Type { get; set; }
/// <summary>
/// 餐次
/// </summary>
public Guid? BusinessShiftCode { get; set; }
/// <summary>
/// 营业点
/// </summary>
public Guid? BusinessPlaceCode { get; set; }
/// <summary>
/// 开始日期
/// </summary>
public DateTime? StartDatetime { get; set; }
/// <summary>
/// 结束日期
/// </summary>
public DateTime? EndDatetime { get; set; }
}
}

36
Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs
View File

@@ -18,7 +18,7 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
public List<ShiftEnumType?> ShiftTypes { get; set; }
/// <summary>
/// 充值/消费
/// 充值/消费 BalanceRecordTypeEnumType
/// </summary>
[EnumDataType(typeof(BalanceRecordTypeEnumType))]
public BalanceRecordTypeEnumType? Type { get; set; }
@@ -37,7 +37,7 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
var now = DateTime.Now;
var today = DateTime.Today;
if (SearchDateTimeDimension.HasValue)
{
//重新赋值
@@ -45,37 +45,47 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
if (SearchDateTimeDimension == DateTimeSearchEnumType.Day)
{
SearchDateTimePeriod.Start = DateTime.Today;
SearchDateTimePeriod.End = new DateTime(now.Year, now.Month, now.Day, 23, 59, 59);
SearchDateTimePeriod.Start = today;
SearchDateTimePeriod.End = today.AddDays(1).AddSeconds(-1);
}
else if (SearchDateTimeDimension == DateTimeSearchEnumType.Week)
{
SearchDateTimePeriod.Start = now.AddDays(1 - (int)now.DayOfWeek);
SearchDateTimePeriod.Start = today.AddDays(1 - (int)today.DayOfWeek);
SearchDateTimePeriod.End = SearchDateTimePeriod.Start.Value.AddDays(6);
}
else if (SearchDateTimeDimension == DateTimeSearchEnumType.Month)
{
SearchDateTimePeriod.Start = new DateTime(now.Year, now.Month, 1);
SearchDateTimePeriod.Start = new DateTime(today.Year, today.Month, 1);
SearchDateTimePeriod.End = SearchDateTimePeriod.Start.Value.AddMonths(1).AddDays(-1);
}
else if (SearchDateTimeDimension == DateTimeSearchEnumType.Season)
{
SearchDateTimePeriod.Start = now.AddMonths(0 - ((now.Month - 1) % 3));
SearchDateTimePeriod.End = now.AddMonths(3 - ((now.Month - 1) % 3)).AddMonths(1).AddDays(-1);
SearchDateTimePeriod.Start = new DateTime(today.Year, today.Month, 1).AddMonths(2 - ((today.Month - 1) % 3));
SearchDateTimePeriod.End = SearchDateTimePeriod.Start.Value.AddMonths(2);
}
else if (SearchDateTimeDimension == DateTimeSearchEnumType.HalfOfYear)
{
SearchDateTimePeriod.Start = now.AddDays(-180);
SearchDateTimePeriod.End = now;
SearchDateTimePeriod.Start = today.AddDays(-180);
SearchDateTimePeriod.End = today;
}
else if (SearchDateTimeDimension == DateTimeSearchEnumType.Year)
{
SearchDateTimePeriod.Start = new DateTime(now.Year, 1, 1);
SearchDateTimePeriod.Start = new DateTime(today.Year, 1, 1);
SearchDateTimePeriod.End = SearchDateTimePeriod.Start.Value.AddYears(1).AddDays(-1);
}
SearchDateTimePeriod.Start = SearchDateTimePeriod.Start.Value.Date;
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.Date;
SearchDateTimePeriod.Start = SearchDateTimePeriod.Start.Value;
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value;
}
else
{
if (SearchDateTimePeriod != null)
{
if (SearchDateTimePeriod.End.HasValue)
{
SearchDateTimePeriod.End = SearchDateTimePeriod.End.Value.AddDays(1).AddSeconds(-1);
}
}
}
yield break;

93
Src/Dlhis.Canteen/Order/Response/BalanceRecordDetailPageResponse.cs Normal file
View File

@@ -0,0 +1,93 @@
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.Utils.Extensions;
using Newtonsoft.Json;
namespace Dlhis.Canteen.Order.Response;
public class BalanceRecordDetailPageResponse
{
public long Id { get; set; }
/// <summary>
/// 流水号
/// </summary>
public string No { get; set; }
/// <summary>
/// 档案号
/// </summary>
public string UserNo { get; set; }
/// <summary>
/// 工号
/// </summary>
public string UserCode { get; set; }
/// <summary>
/// 名称
/// </summary>
public string UserName { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string DepartmentName { get; set; }
/// <summary>
/// 成本日期
/// </summary>
public DateTime CostDate { get; set; }
/// <summary>
/// 消费时间
/// </summary>
public DateTime CostDateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 消费金额
/// </summary>
public string Amount => CurrentAmount.ToString("f2");
[JsonIgnore]
public decimal CurrentAmount { get; set; }
/// <summary>
/// 餐次
/// </summary>
public ShiftEnumType? ShiftType { get; set; }
/// <summary>
/// 餐次
/// </summary>
public string ShiftTypeDesc => ShiftType?.GetDescription();
/// <summary>
/// 营业点
/// </summary>
public string BusinessPlaceName { get; set; }
/// <summary>
/// 扣款方式
/// </summary>
public BalanceRecordSourceEnumType Source { get; set; }
/// <summary>
/// 扣款方式
/// </summary>
public string SourceDesc => Source.GetDescription();
/// <summary>
/// 厂区
/// </summary>
public string Factory { get; set; }
/// <summary>
/// 人事范围
/// </summary>
public string Werks { get; set; }
}

18
Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs
View File

@@ -32,9 +32,17 @@ public class BalanceRecordResponse
/// </summary>
public string DepartmentNo { get; set; }
/// <summary>
/// 部门
/// </summary>
public string DepartmentName { get; set; }
/// <summary>
/// 所属成本日期
/// </summary>
public DateTime CostDate { get; set; }
/// <summary>
/// 来源
/// </summary>
@@ -52,7 +60,6 @@ public class BalanceRecordResponse
/// </summary>
public decimal Amount { get; set; }
/// <summary>
/// 营业点
/// </summary>
@@ -64,12 +71,7 @@ public class BalanceRecordResponse
/// </summary>
public Guid? BusinessShiftCode { get; set; }
public string BusinessShiftName { get; set; }
/// <summary>
/// 所属成本日期
/// </summary>
public DateTime CostDate { get; set; }
/// <summary>
/// 消费机器唯一信息
/// </summary>

1
Src/Dlhis.Canteen/Order/Response/OrderResultResponse.cs
View File

@@ -24,6 +24,7 @@ public class OrderResultResponse
/// </summary>
public string DepartmentName { get; set; }
[JsonIgnore]
public decimal CurrentBalance { get; set; }

2
Src/Dlhis.Canteen/Order/Services/IBalanceService.cs
View File

@@ -17,7 +17,7 @@ public interface IBalanceService : IScopeDependency
Task<Pagination<BalanceRecordCostIdResponse>> RecordByCostIdAsync(BalanceRecordPageByCostIdRequest request);
Task<Pagination<BalanceRecordResponse>> RecordPageDetailsAsync(BalanceRecordPageDetailsRequest request);
Task<Pagination<BalanceRecordDetailPageResponse>> RecordPageDetailsAsync(BalanceRecordPageDetailRequest request);
Task<Pagination<BalanceRecordSummaryRespones>> BalanceRecordSummaryByNoAsync(BalanceRecordSummaryRequest request);

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>
/// 消费汇总 根据部门号