article

src/Hotline.Api/Controllers/ArticleController.cs

@@ -81,6 +81,7 @@ namespace Hotline.Api.Controllers
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title.Contains(dto.Title))
                 .WhereIF(dto.CircularTimeStart.HasValue, d => d.CircularTime >= dto.CircularTimeStart)
                 .WhereIF(dto.CircularTimeEnd.HasValue, d => d.CircularTime <= dto.CircularTimeEnd)
+                .WhereIF(dto.CircularState != null,d=>d.CircularState == dto.CircularState)
                 .OrderByDescending(d => d.CreationTime)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
             return new PagedDto<CircularDto>(total, _mapper.Map<IReadOnlyList<CircularDto>>(items));
@@ -238,7 +239,6 @@ namespace Hotline.Api.Controllers
             return await _workflowApplication.GetStartStepsAsync(WorkflowModuleConsts.CircularApply, HttpContext.RequestAborted);
         }
 
-
         #endregion
 
 
@@ -258,6 +258,7 @@ namespace Hotline.Api.Controllers
                 .WhereIF(!string.IsNullOrEmpty(dto.Title), d => d.Title.Contains(dto.Title))
                 .WhereIF(dto.BulletinTimeStart.HasValue, d => d.BulletinTime >= dto.BulletinTimeStart)
                 .WhereIF(dto.BulletinTimeEnd.HasValue, d => d.BulletinTime <= dto.BulletinTimeEnd)
+                .WhereIF(dto.BulletinState!=null ,d=>d.BulletinState == dto.BulletinState)
                 .OrderByDescending(d => d.CreationTime)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 

src/Hotline.Share/Dtos/Article/BulletinDto.cs

@@ -295,6 +295,11 @@ namespace Hotline.Share.Dtos.Article
         /// 结束时间
         /// </summary>
         public DateTime? CircularTimeEnd { get; set; }
+
+        /// <summary>
+        /// 状态
+        /// </summary>
+        public ECircularState? CircularState { get; set; }
     }
 
     public record QueryBulletinListRequestDto:PagedRequest
@@ -318,6 +323,11 @@ namespace Hotline.Share.Dtos.Article
         /// 结束时间
         /// </summary>
         public DateTime? BulletinTimeEnd { get; set; }
+
+        /// <summary>
+        /// 公告状态
+        /// </summary>
+        public EBulletinState? BulletinState { get; set; }
     }