TANG JIANG 1 jaar geleden
bovenliggende
commit
1236aff720

+ 1 - 1
src/Hotline.Api/Controllers/PushMessageController.cs

@@ -135,7 +135,7 @@ namespace Hotline.Api.Controllers
                     .Includes(it => it.SystemOrganize)
                     .Includes(it => it.Order)
                     .WhereIF(pagedDto.PushBusiness.HasValue, d => d.PushBusiness == pagedDto.PushBusiness)
-                    .WhereIF(pagedDto.Status.HasValue, d => d.Status == pagedDto.Status)
+                    .WhereIF(pagedDto.Status.HasValue, d => d.SendState == pagedDto.Status)
                     .WhereIF(!string.IsNullOrEmpty(pagedDto.Keyword), d => d.Name.Contains(pagedDto.Keyword!) || d.Content.Contains(pagedDto.Keyword!) || d.TelNumber.Contains(pagedDto.Keyword!) || d.User.Name.Contains(pagedDto.Keyword!) || d.SystemOrganize.Name.Contains(pagedDto.Keyword!))
                     .WhereIF(pagedDto.StartTime.HasValue, d => d.SendTime >= pagedDto.StartTime)
                     .WhereIF(pagedDto.EndTime.HasValue, d => d.SendTime <= pagedDto.EndTime)

+ 1 - 1
src/Hotline.Share/Dtos/Push/MessagePagedDto.cs

@@ -11,5 +11,5 @@ namespace Hotline.Share.Dtos.Push
     /// <param name="Status"></param>
     /// <param name="StartTime"></param>
     /// <param name="EndTime"></param>
-    public record MessagePagedDto(EPushBusiness? PushBusiness, EPushStatus? Status, DateTime? StartTime, DateTime? EndTime) : PagedKeywordRequest;
+    public record MessagePagedDto(EPushBusiness? PushBusiness, ESendState? Status, DateTime? StartTime, DateTime? EndTime) : PagedKeywordRequest;
 }

+ 1 - 1
src/Hotline/Push/FWMessage/Message.cs

@@ -40,7 +40,7 @@ namespace Hotline.Push.FWMessage
         /// 推送状态
         /// </summary>
         [SugarColumn(ColumnDescription = "推送状态", ColumnDataType = "varchar(2)")]
-        public EPushStatus Status { get; set; }
+        public EPushStatus Status { get; set; } = EPushStatus.Pushing;
 
         /// <summary>
         /// 模板