提交 35f4056f authored 作者: 000516's avatar 000516

查询活动计划列表-分页,添加是否删除属性

上级 79e9ee15
...@@ -159,7 +159,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao { ...@@ -159,7 +159,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
if (StringUtils.isNotBlank(wrapper.getStoreNameLike())) { if (StringUtils.isNotBlank(wrapper.getStoreNameLike())) {
qw.like(ActivityPlanInfoDo::getStoreName, wrapper.getStoreNameLike()); qw.like(ActivityPlanInfoDo::getStoreName, wrapper.getStoreNameLike());
} }
qw.eq(ActivityPlanInfoDo::getIsDelete, StatusType.VALID.getType()); qw.eq(ActivityPlanInfoDo::getIsDelete,Objects.nonNull(wrapper.getStatusType()) && wrapper.getStatusType().equals(StatusType.INVALID) ? StatusType.INVALID.getType() : StatusType.VALID.getType());
qw.orderByDesc(ActivityPlanInfoDo::getDate) qw.orderByDesc(ActivityPlanInfoDo::getDate)
.orderByAsc(ActivityPlanInfoDo::getPlanStatus) .orderByAsc(ActivityPlanInfoDo::getPlanStatus)
.orderByDesc(ActivityPlanInfoDo::getClockInTime); .orderByDesc(ActivityPlanInfoDo::getClockInTime);
......
...@@ -114,6 +114,8 @@ public class ActivityPlanInfoWrapper { ...@@ -114,6 +114,8 @@ public class ActivityPlanInfoWrapper {
private Integer limitNum; private Integer limitNum;
private StatusType statusType;
public Date getActivityEndDate() { public Date getActivityEndDate() {
String format = DateUtil.format(this.activityEndDate, "yyyy-MM-dd 23:59:59"); String format = DateUtil.format(this.activityEndDate, "yyyy-MM-dd 23:59:59");
return DateUtil.parse(format); return DateUtil.parse(format);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论