|
|
@@ -2587,7 +2587,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
.Where((x, w, wsh, su) => x.CreationTime >= dto.StartTime.Value)
|
|
|
.Where((x, w, wsh, su) => x.CreationTime <= dto.EndTime.Value)
|
|
|
.Where((x, w, wsh, su)=> su.UserId == dto.UserId)
|
|
|
- .WhereIF(dto.TitleCode == "NoSendOrderNum", (x, w, wsh, su) => x.HandlerId == null || x.HandlerId == "")
|
|
|
+ .WhereIF(dto.TitleCode.ToUpper() == "NOSENDORDERNUM", (x, w, wsh, su) => x.HandlerId == null || x.HandlerId == "")
|
|
|
.GroupBy((x, w, wsh, su) => w.ExternalId)
|
|
|
.Select((x, w, wsh, su) => new { Id = w.ExternalId })
|
|
|
.MergeTable()
|
|
|
@@ -2595,7 +2595,7 @@ namespace Hotline.Api.Controllers.Bi
|
|
|
.Select((a, b) => b)
|
|
|
.ToPagedListAsync(dto, HttpContext.RequestAborted);
|
|
|
|
|
|
- if (dto.TitleCode == "ReSendOrderNum")
|
|
|
+ if (dto.TitleCode.ToUpper() == "RESENDORDERNUM")
|
|
|
{
|
|
|
(total, items) = await _workflowTraceRepository.Queryable()
|
|
|
.LeftJoin<Workflow>((x, w) => x.WorkflowId == w.Id)
|
