合并分支 'lql-dev' 到 'qa'

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanInfoDaoImpl.java

@@ -159,7 +159,7 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
         if (StringUtils.isNotBlank(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)
                 .orderByAsc(ActivityPlanInfoDo::getPlanStatus)
                 .orderByDesc(ActivityPlanInfoDo::getClockInTime);

src/main/java/com/wangxiaolu/promotion/domain/manage/wrapperQo/ActivityPlanInfoWrapper.java

@@ -114,6 +114,8 @@ public class ActivityPlanInfoWrapper {
 
     private Integer limitNum;
 
+    private StatusType statusType;
+
     public Date getActivityEndDate() {
         String format = DateUtil.format(this.activityEndDate, "yyyy-MM-dd 23:59:59");
         return DateUtil.parse(format);