增加查询条件

src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -374,6 +374,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             RefAsync<int> total = 0;
             var items = await _dsTelCallRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                 .Where(p => p.FirstSendProvinceTime != null)
                 .Where(p => p.OverTime != null)
                 .Select(p => new
@@ -608,6 +609,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //其他接口
             var waitSendTaskProvinceOther = _waitSendTaskProvinceOtherRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial),p=>p.ProvinceNo==dto.CaseSerial)
                 .Select(p => new DsWaitSendTaskDto
                 {
                     Id = p.Id,
@@ -632,6 +634,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //服务工单受理
             var waitSendTaskSubmitCaseInfo = _waitSendTaskSubmitCaseInfoRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                .Select(p => new DsWaitSendTaskDto
                {
                    Id = p.Id,
@@ -656,6 +659,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //服务工单处理过程
             var waitSendTaskSubmitCaseProcess = _waitSendTaskSubmitCaseProcessRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                  .Select(p => new DsWaitSendTaskDto
                  {
                      Id = p.Id,
@@ -680,6 +684,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //电话记录
             var waitSendTaskSubmitCaseRecord = _waitSendTaskSubmitCaseRecordRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                  .Select(p => new DsWaitSendTaskDto
                  {
                      Id = p.Id,
@@ -704,6 +709,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //服务工单处理结果
             var waitSendTaskSubmitCaseResult = _waitSendTaskSubmitCaseResultRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                  .Select(p => new DsWaitSendTaskDto
                  {
                      Id = p.Id,
@@ -752,6 +758,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             //其他平台
             var items = await _waitSendTaskOtherPlatformsRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                 .Select(p => new DsWaitSendTaskDto
                 {
                     Id = p.Id,
@@ -819,6 +826,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 //服务工单受理
                 var items = await _sendTaskSubmitCaseInfoRepository.Queryable()
                     .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+                .WhereIF(!string.IsNullOrEmpty(dto.Path), p => p.Path == dto.Path)
                    .Select(p => new DsEndSendTaskDto
                    {
                        Id = p.Id,
@@ -848,6 +857,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 //电话记录
                 var items = await _sendTaskSubmitCaseRecordRepository.Queryable()
                     .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+                .WhereIF(!string.IsNullOrEmpty(dto.Path), p => p.Path == dto.Path)
                      .Select(p => new DsEndSendTaskDto
                      {
                          Id = p.Id,
@@ -877,6 +888,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 //服务工单处理过程
                 var items = await _sendTaskSubmitCaseProcessRepository.Queryable()
                     .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+                .WhereIF(!string.IsNullOrEmpty(dto.Path), p => p.Path == dto.Path)
                      .Select(p => new DsEndSendTaskDto
                      {
                          Id = p.Id,
@@ -905,6 +918,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 //服务工单处理结果
                 var items = await _sendTaskSubmitCaseResultRepository.Queryable()
                     .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+                .WhereIF(!string.IsNullOrEmpty(dto.Path), p => p.Path == dto.Path)
                      .Select(p => new DsEndSendTaskDto
                      {
                          Id = p.Id,
@@ -933,6 +948,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 //其他接口
                 var items = await _sendTaskProvinceOtherRepository.Queryable()
                     .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+                .WhereIF(!string.IsNullOrEmpty(dto.Path), p => p.Path == dto.Path)
                     .Select(p => new DsEndSendTaskDto
                     {
                         Id = p.Id,
@@ -961,6 +978,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 //其他平台
                 var items = await _sendTaskOtherPlatformsRepository.Queryable()
                     .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
+                .WhereIF(!string.IsNullOrEmpty(dto.Path), p => p.Path == dto.Path)
                     .Select(p => new DsEndSendTaskDto
                     {
                         Id = p.Id,
@@ -1135,6 +1154,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             var items = await _dsOrderSendRepository.Queryable()
                 .Where(p => p.CreationTime >= dto.StartTime && p.CreationTime <= dto.EndTime)
                 .Where(p => p.FirstSendProvinceTime.HasValue && p.StartTime.HasValue)
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                 .Select(p => new
                 {
                     p.OrderId,
@@ -1179,6 +1199,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 .Where((p, o) => p.FirstSendProvinceTime >= dto.StartTime && p.FirstSendProvinceTime <= dto.EndTime && p.CaseSourceCode == "RGDH")
                 .Where((p, o) => p.FirstSendProvinceTime.HasValue)
                 .Where((p, o) => o.CallId == null || o.CallId == "")
+                .WhereIF(!string.IsNullOrEmpty(dto.CaseSerial), p => p.ProvinceNo == dto.CaseSerial)
                 .OrderByDescending((p, o) => p.CreationTime)
                .ToPageListAsync(dto.PageIndex, dto.PageSize, total, HttpContext.RequestAborted);
 

src/DataSharing.Share/Dtos/HotlineWeb/QuerySendTaskDto.cs

@@ -28,6 +28,16 @@ namespace DataSharing.Share.Dtos.HotlineWeb
         /// 查询类型 1：服务工单受理，2、电话记录，3、服务工单处理过程，4、服务工单处理结果，5、省平台其他推送，6、其他平台
         /// </summary>
         public string SelectType { get; set; } = "1";
+
+        /// <summary>
+        /// 省工单编号
+        /// </summary>
+        public string? CaseSerial { get; set; }
+
+        /// <summary>
+        /// 请求地址
+        /// </summary>
+        public string? Path { get; set; }
     }
 
     public record QueryCaseMaterialInfoDto : PagedKeywordRequest