b

src/DataSharing.Host/Controllers/HotlineWebController.cs

@@ -27,6 +27,7 @@ using DotNetCore.CAP;
 using Hotline.Share.Dtos;
 using Hotline.Share.Dtos.Order;
 using Hotline.Share.Enums.CallCenter;
+using Hotline.Share.Enums.Order;
 using MapsterMapper;
 using MediatR;
 using Microsoft.AspNetCore.Authorization;
@@ -42,6 +43,7 @@ using XC.RSAUtil;
 using XF.Domain.Cache;
 using XF.Domain.Exceptions;
 using XF.Domain.Repository;
+using XF.Utility.EnumExtensions;
 using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
 
 namespace DataSharing.Host.Controllers
@@ -390,6 +392,7 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                 .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)
+                .WhereIF(dto.PlatformSource.HasValue, p => p.PlatformSource == dto.PlatformSource)
                 .Select(p => new DsWaitSendTaskDto
                 {
                     Id = p.Id,
@@ -434,6 +437,21 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
             return new PagedDto<DsSendTaskDetailInfo>(total, items);
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("getbaseinfo")]
+        [AllowAnonymous]
+        public async Task<object> GetBaseInfo()
+        {
+            var rsp = new
+            {
+                EPlatformSource = EnumExts.GetDescriptions<EPlatformSource>(),
+            };
+            return rsp;
+        }
+
         /// <summary>
         /// 查询已推送任务  查询类型 1：服务工单受理，2、电话记录，3、服务工单处理过程，4、服务工单处理结果，5、省平台其他推送，6、其他平台
         /// </summary>
@@ -459,6 +477,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                     .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)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => p.IsSuccess == ESendTaskState.PushSuccess)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => p.IsSuccess == ESendTaskState.PushFail)
                    .Select(p => new DsEndSendTaskDto
                    {
                        Id = p.Id,
@@ -491,6 +511,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                     .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)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => p.IsSuccess == ESendTaskState.PushSuccess)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => p.IsSuccess == ESendTaskState.PushFail)
                      .Select(p => new DsEndSendTaskDto
                      {
                          Id = p.Id,
@@ -522,6 +544,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                     .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)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => p.IsSuccess == ESendTaskState.PushSuccess)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => p.IsSuccess == ESendTaskState.PushFail)
                      .Select(p => new DsEndSendTaskDto
                      {
                          Id = p.Id,
@@ -552,6 +576,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                     .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)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => p.IsSuccess == ESendTaskState.PushSuccess)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => p.IsSuccess == ESendTaskState.PushFail)
                      .Select(p => new DsEndSendTaskDto
                      {
                          Id = p.Id,
@@ -584,6 +610,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                     .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)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => p.IsSuccess == ESendTaskState.PushSuccess)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => p.IsSuccess == ESendTaskState.PushFail)
                     .Select(p => new DsEndSendTaskDto
                     {
                         Id = p.Id,
@@ -614,6 +642,9 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
                     .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)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == true, p => p.IsSuccess == ESendTaskState.PushSuccess)
+                .WhereIF(dto.IsSuccess.HasValue && dto.IsSuccess == false, p => p.IsSuccess == ESendTaskState.PushFail)
+                .WhereIF(dto.PlatformSource.HasValue, p => p.PlatformSource == dto.PlatformSource)
                     .Select(p => new DsEndSendTaskDto
                     {
                         Id = p.Id,

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

@@ -1,4 +1,5 @@
-using DataSharing.Share.Requests;
+using DataSharing.Share.Enums;
+using DataSharing.Share.Requests;
 
 namespace DataSharing.Share.Dtos.HotlineWeb
 {
@@ -38,6 +39,11 @@ namespace DataSharing.Share.Dtos.HotlineWeb
         /// 请求地址
         /// </summary>
         public string? Path { get; set; }
+
+        /// <summary>
+        /// 业务平台
+        /// </summary>
+        public EPlatformSource? PlatformSource { get; set; }
     }
 
     public record QueryCaseMaterialInfoDto : PagedKeywordRequest
@@ -55,6 +61,6 @@ namespace DataSharing.Share.Dtos.HotlineWeb
         /// <summary>
         /// 省工单编号
         /// </summary>
-       public string? CaseSerial { get; set; }
+        public string? CaseSerial { get; set; }
     }
 }