fix CMSAdvertisementService.search

luoo_music/src/main/java/com/luoo/music/dto/response/cms/ArticleRespDTO.java

@@ -35,6 +35,18 @@ public class ArticleRespDTO implements Serializable {
     @ApiModelProperty(value = "编辑日期，格式为: yyyy.MM.dd")
     private String date;
 
+    @ApiModelProperty(value = "是否定时发布  否：0 是：1")
+    private String isScheduled;
+
+    @ApiModelProperty(value = "发布时间，格式为: yyyy.MM.dd")
+    private String pubTime;
+
+    @ApiModelProperty(value = "是否允许评论  否：0 是：1")
+    private String allowCommit;
+
+    @ApiModelProperty(value = "是否自动推送  否：0 是：1")
+    private String autoPush;
+
     @ApiModelProperty(value = "总评论数,大于99，显示99+")
     private Long commitsNum;
     @ApiModelProperty(value = "总阅览数,大于99，显示99+")
@@ -58,6 +70,11 @@ public class ArticleRespDTO implements Serializable {
         response.setDate(article.getPubTime().toString());
         response.setCommitsNum(article.getComment());
         response.setVistisNum(article.getVisits());
+        response.setIsScheduled(article.getIsScheduled());
+        response.setPubTime(article.getPubTime().format(Constants.formatter));
+        response.setAllowCommit(article.getAllowCommit());
+        response.setAutoPush(article.getAutoPush());
+
         return response;
     }
 }

luoo_music/src/main/java/com/luoo/music/service/CMSAdvertisementService.java

@@ -209,9 +209,9 @@ public class CMSAdvertisementService {
             predicateList.add(builder.and(isDeleted, isDisplay));
 
 
-            LocalDateTime now = LocalDateTime.now();
-            predicateList.add(builder.lessThan(root.get("startTime"),now));
-            predicateList.add(builder.greaterThan(root.get("endTime"), now));
+//            LocalDateTime now = LocalDateTime.now();
+//            predicateList.add(builder.lessThan(root.get("startTime"),now));
+//            predicateList.add(builder.greaterThan(root.get("endTime"), now));
 
             return builder.and(predicateList.toArray(new Predicate[predicateList.size()]));
         };