|
@@ -358,6 +358,10 @@ public abstract class DefaultCallApplication : ICallApplication
|
|
|
query = query.WhereIF(dto.Type == 3, (d, o, v) => d.AnsweredTime == null);
|
|
|
query = query.WhereIF(dto.Type == 1, (d, o, v) => d.Direction == ECallDirection.In && d.AnsweredTime != null);
|
|
|
query = query.WhereIF(dto.Type == 2, (d, o, v) => d.Direction == ECallDirection.Out && d.AnsweredTime != null);
|
|
|
+
|
|
|
+ query = query.WhereIF(dto.Type == 4, (d, o, v) => d.CallIdentity == ECallIdentity.White);
|
|
|
+ query = query.WhereIF(dto.Type == 5, (d, o, v) => d.CallIdentity == ECallIdentity.Black);
|
|
|
+
|
|
|
query = query.WhereIF(dto.Type != 3 && !string.IsNullOrEmpty(dto.StaffNo), d => d.StaffNo == dto.StaffNo);
|
|
|
|
|
|
if (dto.Type == 2)
|
|
@@ -376,7 +380,7 @@ public abstract class DefaultCallApplication : ICallApplication
|
|
|
#endif
|
|
|
return d;
|
|
|
}
|
|
|
- if (dto.Type == 3)
|
|
|
+ if (dto.Type == 3 || dto.Type == 5)
|
|
|
{
|
|
|
return query.Select((d, o, v) => new CallNativeDto
|
|
|
{
|