|
|
@@ -1786,7 +1786,7 @@ namespace Hotline.Application.StatisticalReport
|
|
|
})
|
|
|
.MergeTable()
|
|
|
.LeftJoin<SystemOrganize>((it, sy) => it.OrgCode == sy.Id)
|
|
|
- // .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (it, sy) => sy.Name.Contains(dto.OrgName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (it, sy) => sy.Name.Contains(dto.OrgName))
|
|
|
.GroupBy((it, sy) => new
|
|
|
{
|
|
|
it.OrgCode,
|
|
|
@@ -1814,7 +1814,7 @@ namespace Hotline.Application.StatisticalReport
|
|
|
})
|
|
|
.MergeTable()
|
|
|
.LeftJoin<SystemOrganize>((it, sy) => it.OrgCode == sy.Id)
|
|
|
- // .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (it, sy) => sy.Name.Contains(dto.OrgName))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.OrgName), (it, sy) => sy.Name.Contains(dto.OrgName))
|
|
|
.GroupBy((it, sy) => new
|
|
|
{
|
|
|
it.OrgCode,
|
|
|
@@ -1828,7 +1828,8 @@ namespace Hotline.Application.StatisticalReport
|
|
|
CounterNoSign = SqlFunc.AggregateSum(1)
|
|
|
}).MergeTable();
|
|
|
|
|
|
- return await _orderRepository.UnionAll(queryOrderNoSigen, queryCounterNoSign).GroupBy(p => new { p.OrgCode, p.OrgName })
|
|
|
+ return await _orderRepository.UnionAll(queryOrderNoSigen, queryCounterNoSign)
|
|
|
+ .GroupBy(p => new { p.OrgCode, p.OrgName })
|
|
|
.Select(p => new OrderNoSigenDto
|
|
|
{
|
|
|
OrgName = p.OrgName,
|
|
|
@@ -1921,6 +1922,7 @@ namespace Hotline.Application.StatisticalReport
|
|
|
|
|
|
return await _userRepository.Queryable()
|
|
|
.Where(u => userData.Contains(u.Id))
|
|
|
+ .WhereIF(!string.IsNullOrEmpty(dto.UserName), u => u.Name.Contains(dto.UserName))
|
|
|
.LeftJoin(queryOrderData, (u, qo) => u.Id == qo.UserId)
|
|
|
.LeftJoin(queryCall, (u, qo, qc) => u.Id == qc.UserId)
|
|
|
.Select((u, qo, qc) => new EnterpriseSeatsReportDto
|
tangjiang