he2802 4 роки тому
батько
коміт
c70432efb8

+ 2 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityAdvertisingServiceImpl.java

@@ -43,8 +43,6 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         lqw.ne(bo.getStatus() == null,ActivityAdvertising::getStatus,0);
         lqw.eq(StrUtil.isNotBlank(bo.getAdverUrl()), ActivityAdvertising::getAdverUrl, bo.getAdverUrl());
         lqw.eq(StrUtil.isNotBlank(bo.getJumpUrl()), ActivityAdvertising::getJumpUrl, bo.getJumpUrl());
-        lqw.eq(bo.getStartTime() != null, ActivityAdvertising::getStartTime, bo.getStartTime());
-        lqw.eq(bo.getEndTime() != null, ActivityAdvertising::getEndTime, bo.getEndTime());
         lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityAdvertising::getRemarks, bo.getRemarks());
         lqw.eq(bo.getReStatus() != null, ActivityAdvertising::getReStatus, bo.getReStatus());
         lqw.eq(bo.getStatus() != null, ActivityAdvertising::getStatus, bo.getStatus());
@@ -53,7 +51,8 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         lqw.apply(bo.getEndTime() != null,"end_time BETWEEN {0} and {1}",bo.getStartTime(),bo.getEndTime());
         lqw.apply(bo.getStarIssueTime() != null,"start_time BETWEEN {0} and {1}",bo.getStarIssueTime(),bo.getEndIssueTime());
         lqw.orderByDesc(ActivityAdvertising::getUpdateTime);
-        return entity2Vo(this.list(lqw));
+        List<ActivityAdvertising> list = this.list(lqw);
+        return entity2Vo(list);
     }
 
     /**

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/vo/ActivityAdvertisingVo.java

@@ -62,4 +62,9 @@ public class ActivityAdvertisingVo {
 	@ApiModelProperty("广告名称")
 	private String advName;
 
+
+	/** 创建时间 */
+	@Excel(name = "创建时间")
+	@ApiModelProperty("创建时间")
+	private Long createTime;
 }