Browse Source

更新版本

master
zhaoxinyu 4 months ago
parent
commit
30cb3809e0
  1. 41
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs
  2. 2
      code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs

41
code/src/Modules/SettleAccount/src/SettleAccount.Application/Bases/CAN_SA_SERVICE.cs

@ -69,10 +69,24 @@ namespace Win.Sfs.SettleAccount.Bases
//[Route("detailquery")]
public virtual async Task<PagedResultDto<TEntityDetailDto>> DetailQueryAsync(TRequestDetailInput input)
{
List<string> filters = new List<string>();
filters.Add("ParentBillNum");
filters.Add("InvBillNum");
filters.Add("IsReturn");
var ls = input.Filters.Where(p =>filters.Contains( p.Column )).ToList();
if (ls.Count > 0)
{
foreach (var itm in ls)
{
input.Filters.Remove(itm);
}
}
var entitys = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount).ConfigureAwait(false);
var totalCount = await _detailRepository.GetCountByFilterAsync(input.Filters).ConfigureAwait(false);
var dtos = ObjectMapper.Map<List<TEntityDetail>, List<TEntityDetailDto>>(entitys);
return new PagedResultDto<TEntityDetailDto>(totalCount, dtos);
}
@ -85,21 +99,28 @@ namespace Win.Sfs.SettleAccount.Bases
//[Route("export")]
public virtual async Task<string> ExportAsync(TRequestDetailInput input)
{
IExporter _csv = new CsvExporter();
IExporter _excel = new ExcelExporter();
var entities = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true).ConfigureAwait(false);
var dtoDetails = ObjectMapper.Map<List<TEntityDetail>, List<TEntityDetailExportDto>>(entities);
var entities = await _detailRepository.GetListByFilterAsync(input.Filters, input.Sorting, int.MaxValue, 0, true).ConfigureAwait(false);
List<string> filters = new List<string>();
filters.Add("ParentBillNum");
filters.Add("InvBillNum");
filters.Add("IsReturn");
var ls = input.Filters.Where(p => filters.Contains(p.Column)).ToList();
if (ls.Count > 0)
{
foreach (var itm in ls)
{
input.Filters.Remove(itm);
}
}
IExporter _csv = new CsvExporter();
IExporter _excel = new ExcelExporter();
var dtoDetails = ObjectMapper.Map<List<TEntityDetail>, List<TEntityDetailExportDto>>(entities);

2
code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/BBAC_SA_SERVICE.cs

@ -301,8 +301,8 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
{
try
{
var bbacSaDelItems = await GetBBACSaDelItemsAsync(id).ConfigureAwait(false);
var bbacSaDelItems = await GetBBACSaDelItemsAsync(id).ConfigureAwait(false);
bbacSas.AddRange(bbacSaDelItems.bbacSas);
bbacSaDetails.AddRange(bbacSaDelItems.bbacSaDetails);
bbacCanSas.AddRange(bbacSaDelItems.bbacCanSas);

Loading…
Cancel
Save