|
@@ -168,10 +168,15 @@ namespace Hotline.Api.Controllers.Bi
|
|
[HttpGet("org_data_list")]
|
|
[HttpGet("org_data_list")]
|
|
public async Task<PagedDto<OrderBiOrgDataListVo>> OrgDataList([FromQuery] ReportPagedRequest dto)
|
|
public async Task<PagedDto<OrderBiOrgDataListVo>> OrgDataList([FromQuery] ReportPagedRequest dto)
|
|
{
|
|
{
|
|
-
|
|
|
|
var query = _orderApplication.QueryOrgDataList(dto);
|
|
var query = _orderApplication.QueryOrgDataList(dto);
|
|
var (total, items) = await query.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
var (total, items) = await query.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
- return new PagedDto<OrderBiOrgDataListVo>(total, items);
|
|
|
|
|
|
+ items.Add(new OrderBiOrgDataListVo { OrgName = "合计",
|
|
|
|
+ HandlerExtendedNum = items.Select(s=>s.HandlerExtendedNum).Sum(),
|
|
|
|
+ CounterHandlerExtendedNum = items.Select(s => s.CounterHandlerExtendedNum).Sum(),
|
|
|
|
+ NoHandlerExtendedNum = items.Select(s => s.NoHandlerExtendedNum).Sum(),
|
|
|
|
+ CounterNoHandlerExtendedNum = items.Select(s => s.CounterNoHandlerExtendedNum).Sum(),
|
|
|
|
+ });
|
|
|
|
+ return new PagedDto<OrderBiOrgDataListVo>(total, items);
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|
|
@@ -2019,7 +2024,12 @@ namespace Hotline.Api.Controllers.Bi
|
|
var query = _orderApplication.OrderReTransact(dto);
|
|
var query = _orderApplication.OrderReTransact(dto);
|
|
var (total, items) = await query
|
|
var (total, items) = await query
|
|
.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
- return new PagedDto<OrderReTransactVo>(total, _mapper.Map<IReadOnlyList<OrderReTransactVo>>(items));
|
|
|
|
|
|
+ items.Add(new OrderReTransactVo
|
|
|
|
+ {
|
|
|
|
+ OrgName = "合计",
|
|
|
|
+ Num = items.Select(s => s.Num).Sum(),
|
|
|
|
+ });
|
|
|
|
+ return new PagedDto<OrderReTransactVo>(total, _mapper.Map<IReadOnlyList<OrderReTransactVo>>(items));
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|