|
|
@@ -81,7 +81,7 @@ namespace Hotline.Application.StatisticalReport
|
|
|
dto.EndTime = dto.EndTime.AddDays(1).AddSeconds(-1);
|
|
|
var IsCenter = _sessionContext.OrgIsCenter;
|
|
|
|
|
|
- //信件总量：信件总量=已办件数+在办件数，工单需去重
|
|
|
+ //信件总量：信件总量=已办件数+在办件数+会签已办+会签待办
|
|
|
//已办件数：该部门已办理完成的工单总数（含参与会签的工单），若工单被部门多次办理，只统计一次
|
|
|
//在办件数：该部门还未办理的工单数（若是一级部门，需包含中心向该部门发起回签的工单）。（特殊说明：部门或者中心发起了会签，会签中还未汇总，应算发起会签部门的在办里面）
|
|
|
|
|
|
@@ -101,7 +101,16 @@ namespace Hotline.Application.StatisticalReport
|
|
|
|
|
|
strSql = string.Format(strSql, dto.StartTime, dto.EndTime, strWhere, orgLength, isOrg, orgName);
|
|
|
|
|
|
- return _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
|
|
|
+ var list= _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
|
|
|
+ if (list!=null)
|
|
|
+ {
|
|
|
+ foreach (var item in list)
|
|
|
+ {
|
|
|
+ item.YbOrderCountNum = item.YbOrderCountNum + item.DelayEnd;
|
|
|
+ item.ZbOrderCountNum = item.ZbOrderCountNum + item.DelayWait;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -137,7 +146,16 @@ namespace Hotline.Application.StatisticalReport
|
|
|
|
|
|
strSql = string.Format(strSql, dto.StartTime, dto.EndTime, strWhere, orgLength, isOrg, orgName);
|
|
|
|
|
|
- return _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
|
|
|
+ var list = _orderRepository.DepartmentalProcessingStatisticsNew(strSql);
|
|
|
+ if (list != null)
|
|
|
+ {
|
|
|
+ foreach (var item in list)
|
|
|
+ {
|
|
|
+ item.YbOrderCountNum += item.DelayEnd;
|
|
|
+ item.ZbOrderCountNum += item.DelayWait;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -468,7 +486,7 @@ namespace Hotline.Application.StatisticalReport
|
|
|
// .Select((t, o) => new SelectOrderId { Id = o.Id })
|
|
|
// .MergeTable();
|
|
|
var query = _orderRepository.Queryable()
|
|
|
- .Where(o => o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime)
|
|
|
+ .Where(o => o.CreationTime >= dto.StartTime && o.CreationTime <= dto.EndTime && o.Status > EOrderStatus.WaitForAccept)
|
|
|
.WhereIF(dto.IsProvince.HasValue && dto.IsProvince == true, o => o.Source == ESource.ProvinceStraight)
|
|
|
.WhereIF(dto.TypeId != null && dto.TypeId == 1, o => o.IdentityType == EIdentityType.Citizen)
|
|
|
.WhereIF(dto.TypeId != null && dto.TypeId == 2, o => o.IdentityType == EIdentityType.Enterprise)
|
tangjiang