|
|
@@ -534,14 +534,14 @@ namespace Hotline.Api.Controllers.Bigscreen
|
|
|
if (_appOptions.Value.IsLuZhou)
|
|
|
{
|
|
|
list = await _orderVisitDetailRepository.Queryable()
|
|
|
- .Includes(x => x.OrderVisit)
|
|
|
- .Where(x => x.OrderVisit.VisitTime >= StartTime && x.OrderVisit.VisitTime <= EndTime && x.VisitTarget == EVisitTarget.Org &&
|
|
|
- x.VisitOrgCode.Length >= 6 && x.OrderVisit.VisitState == EVisitState.Visited)
|
|
|
- .GroupBy(x => new
|
|
|
+ .LeftJoin<OrderVisit>((x,ov)=>x.VisitId == ov.Id)
|
|
|
+ .Where((x, ov) => ov.VisitTime >= StartTime && ov.VisitTime <= EndTime && x.VisitTarget == EVisitTarget.Org &&
|
|
|
+ x.VisitOrgCode.Length >= 6 && ov.VisitState == EVisitState.Visited)
|
|
|
+ .GroupBy((x, ov) => new
|
|
|
{
|
|
|
VisitOrgCode = x.VisitOrgCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6"))
|
|
|
})
|
|
|
- .Select(x => new OrderVisitOrgSatisfactionRankDto()
|
|
|
+ .Select((x, ov) => new OrderVisitOrgSatisfactionRankDto()
|
|
|
{
|
|
|
VisitOrgCode = x.VisitOrgCode.Substring(SqlFunc.MappingColumn<int>("0"), SqlFunc.MappingColumn<int>("6")),
|
|
|
SatisfiedCount =
|
