促销计划按条件，分页查询

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

@@ -90,38 +90,49 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
         activityPlanInfoMapper.updateIsDelete(planIds);
     }
 
+    /**
+     * todo
+     * @param wrapper
+     * @return
+     */
 
     private LambdaQueryWrapper<ActivityPlanInfoDo> buildWrapper(ActivityPlanInfoWrapper wrapper) {
         LambdaQueryWrapper<ActivityPlanInfoDo> qw = new LambdaQueryWrapper<>();
+        // 日期区间
+        qw.between(ActivityPlanInfoDo::getDate, wrapper.getActivityStartDate(), wrapper.getActivityEndDate());
+
         if (Objects.nonNull(wrapper.getEmployeeId())) {
             qw.eq(ActivityPlanInfoDo::getEmployeeId, wrapper.getEmployeeId());
         }
 
-        if (Objects.nonNull(wrapper.getActivityPlanRecordId())) {
-            qw.eq(ActivityPlanInfoDo::getPlanFileId, wrapper.getActivityPlanRecordId());
-        }
+//        if (Objects.nonNull(wrapper.getActivityPlanRecordId())) {
+//            qw.eq(ActivityPlanInfoDo::getPlanFileId, wrapper.getActivityPlanRecordId());
+//        }
 
-        if (StringUtils.isNotBlank(wrapper.getDealerName())) {
-            qw.like(ActivityPlanInfoDo::getDealerName, wrapper.getDealerName());
+        if (StringUtils.isNotBlank(wrapper.getProvince())) {
+            qw.eq(ActivityPlanInfoDo::getProvince, wrapper.getProvince());
         }
 
         if (StringUtils.isNotBlank(wrapper.getCity())) {
-            qw.like(ActivityPlanInfoDo::getCity, wrapper.getCity());
+            qw.eq(ActivityPlanInfoDo::getCity, wrapper.getCity());
         }
 
-        if (StringUtils.isNotBlank(wrapper.getStoreNameLike())) {
-            qw.like(ActivityPlanInfoDo::getStoreName, wrapper.getStoreNameLike());
+        if (StringUtils.isNotBlank(wrapper.getDealerId())) {
+            qw.eq(ActivityPlanInfoDo::getDealerId, wrapper.getDealerId());
         }
 
-        if (StringUtils.isNotBlank(wrapper.getStoreName())) {
-            qw.eq(ActivityPlanInfoDo::getStoreName, wrapper.getStoreName());
+//        是否执行：1:执行；0：未执行；
+        if (Objects.nonNull(wrapper.getPlanStatus())) {
+            qw.eq(ActivityPlanInfoDo::getPlanStatus, wrapper.getPlanStatus().getCode());
         }
 
-        if (Objects.nonNull(wrapper.getActivityStatus())) {
-            qw.eq(ActivityPlanInfoDo::getPlanStatus, wrapper.getActivityStatus().getType());
+        if (StringUtils.isNotBlank(wrapper.getOrgQcId())){
+            qw.eq(ActivityPlanInfoDo::getOrgQcId, wrapper.getOrgQcId());
         }
 
-        qw.between(ActivityPlanInfoDo::getDate, wrapper.getActivityStartDate(), wrapper.getActivityEndDate());
+        if (StringUtils.isNotBlank(wrapper.getStoreNameLike())) {
+            qw.like(ActivityPlanInfoDo::getStoreName, wrapper.getStoreNameLike());
+        }
         qw.eq(ActivityPlanInfoDo::getIsDelete, StatusType.VALID.getType());
         qw.orderByDesc(ActivityPlanInfoDo::getCreateTime);
         return qw;

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

 package com.wangxiaolu.promotion.domain.manage.wrapperQo;
 
+import cn.hutool.core.date.DateUtil;
 import com.wangxiaolu.promotion.common.enums.StatusType;
+import com.wangxiaolu.promotion.enums.plan.PlanStatus;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -50,6 +52,11 @@ public class ActivityPlanInfoWrapper {
      */
     private Date activityEndDate;
 
+    /**
+     * 省
+     */
+    private String province;
+
     /**
      * 城市
      */
@@ -66,6 +73,12 @@ public class ActivityPlanInfoWrapper {
     private String storeName;
     private String storeNameLike;
     private String qinceStoreCode;
+    private String StoreCode;
+
+    /**
+     * 部门勤策编码
+     */
+    private String orgQcId;
 
     /**
      * 经销商名称
@@ -75,7 +88,13 @@ public class ActivityPlanInfoWrapper {
     /**
      * 活动状态
      */
-    private StatusType activityStatus;
+    private  StatusType activityStatus;
+
+    /**
+     * 活动计划状态
+     * 是否执行：1:执行；0：未执行；
+     */
+    private PlanStatus planStatus;
 
     private List<Long> ids;
 
@@ -88,4 +107,9 @@ public class ActivityPlanInfoWrapper {
      */
     private Integer activityPatternId;
     private String activityPattern;
+
+    public Date getActivityEndDate() {
+        String format = DateUtil.format(this.activityEndDate, "yyyy-MM-dd 23:59:59");
+        return DateUtil.parse(format);
+    }
 }