开业筹备阶段5.0

coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/OpenPlanShopInfoDTO.java

@@ -1,8 +1,11 @@
 package com.cool.store.dto.openPreparation;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Auther: WangShuo
  * @Date: 2024/04/24/上午9:53
@@ -18,6 +21,8 @@ public class OpenPlanShopInfoDTO {
     @ApiModelProperty("线索id")
     private Long lineId;
 
+    @ApiModelProperty("区域id")
+    private Long regionId;
     @ApiModelProperty("门店名字")
     private String shopName;
 
@@ -45,6 +50,12 @@ public class OpenPlanShopInfoDTO {
     @ApiModelProperty("所属战区")
     private String fightName;
 
+    @ApiModelProperty("方案审核状态")
+    private Integer resultType;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("提交申请时间")
+    private Date submissionTime;
 
 
 }

coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/UserNameDTO.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class UserNameDTO {
 
 
-    private Long  userId;
+    private String   userId;
 
     private String name;
 

coolstore-partner-model/src/main/java/com/cool/store/request/PlanListRequest.java

@@ -1,10 +1,12 @@
 package com.cool.store.request;
 
+import com.cool.store.common.PageBasicInfo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.time.LocalDate;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Auther: WangShuo
@@ -13,19 +15,19 @@ import java.util.Date;
  * @注释:
  */
 @Data
-public class PlanListRequest {
+public class PlanListRequest extends PageBasicInfo {
     @ApiModelProperty("店铺名称")
     private String shopName;
     @ApiModelProperty("起始日期")
-    private Date planStartDate;
+    private String planStartDate;
     @ApiModelProperty("结束日期")
-    private Date planEndDate;
-    @ApiModelProperty("地区id")
-    private String regionId;
+    private String planEndDate;
+    @ApiModelProperty("选择区域")
+    private List<String> regionIds;
     @ApiModelProperty("审核状态")
     private Integer resultType;
-    @ApiModelProperty("页数")
-    private Integer pageNum;
-    @ApiModelProperty("分页数据量")
-    private Integer pageSize;
+    @ApiModelProperty(value = "当前登录用户", hidden = true)
+    private String curUserId;
+    @ApiModelProperty(value = "管辖区域",hidden = true)
+    private List<String> authRegionIds;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanListVO.java

@@ -15,15 +15,9 @@ import java.util.Date;
 @Data
 public class OpeningOperationPlanListVO {
 
-    @ApiModelProperty("方案关联审核id")
-    private Long auditId;
-
     @ApiModelProperty("门店id")
     private Long shopId;
 
-    @ApiModelProperty("线索id")
-    private Long lineId;
-
     @ApiModelProperty("门店名称")
     private String shopName;
 
@@ -33,8 +27,6 @@ public class OpeningOperationPlanListVO {
     @ApiModelProperty("开店负责人")
     private String shopManagerName;
 
-    @ApiModelProperty("开店负责人id")
-    private String shopManagerUserId;
 
     @ApiModelProperty("加盟商姓名")
     private String partnerName;
@@ -51,8 +43,6 @@ public class OpeningOperationPlanListVO {
     @ApiModelProperty("招商经理名字")
     private String investmentManagerName;
 
-    @ApiModelProperty("督导id")
-    private String supervisorUserId;
 
     @ApiModelProperty("督导")
     private String supervisorName;