|
|
@@ -1647,15 +1647,15 @@ public class OrderApplication : IOrderApplication, IScopeDependency
|
|
|
var query = _workflowTraceRepository.Queryable()
|
|
|
.WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue, x => x.HandleTime >= dto.StartTime && x.HandleTime <= dto.EndTime)
|
|
|
.WhereIF(!string.IsNullOrEmpty(dto.AuditUserName), x => x.HandlerName == dto.AuditUserName)
|
|
|
- .Where(x=> x.HandlerName != null && x.HandlerName != "" && x.Status == EWorkflowStepStatus.Handled)
|
|
|
+ .Where(x=> x.HandlerName != null && x.HandlerName != "")
|
|
|
.WhereIF(dto.AuditType is 1,x=>x.Name == "班长审批")
|
|
|
.WhereIF(dto.AuditType is 2, x => x.Name == "中心领导")
|
|
|
.GroupBy(x => new { x.HandlerName })
|
|
|
.Select(x => new OrderScreenAuditVo
|
|
|
{
|
|
|
AuditName = x.HandlerName,
|
|
|
- AuditNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceState == EWorkflowTraceState.Normal, 1, 0)),
|
|
|
- AuditBackNum = SqlFunc.AggregateSum(SqlFunc.IIF( x.TraceState != EWorkflowTraceState.Normal, 1, 0)),
|
|
|
+ AuditNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceType == EWorkflowTraceType.Normal, 1, 0)),
|
|
|
+ AuditBackNum = SqlFunc.AggregateSum(SqlFunc.IIF(x.TraceType == EWorkflowTraceType.Previous, 1, 0)),
|
|
|
});
|
|
|
return query;
|
|
|
}
|
