开业筹备阶段4.0

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

@@ -20,10 +20,8 @@ public class PlanListRequest {
     private Date planStartDate;
     @ApiModelProperty("结束日期")
     private Date planEndDate;
-    @ApiModelProperty("大区名称")
-    private String bigName;
-    @ApiModelProperty("战区名称")
-    private String fightName;
+    @ApiModelProperty("地区id")
+    private String regionId;
     @ApiModelProperty("审核状态")
     private Integer resultType;
     @ApiModelProperty("页数")

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

@@ -1,5 +1,6 @@
 package com.cool.store.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -57,6 +58,7 @@ public class OpeningOperationPlanListVO {
     private String supervisorName;
 
     @ApiModelProperty("提交申请时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date submissionTime;
 
     @ApiModelProperty("审核结果,0待审核，1通过，2拒绝")

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

@@ -1,6 +1,8 @@
 package com.cool.store.vo;
 
 import com.cool.store.dto.openPreparation.UserNameDTO;
+import com.cool.store.entity.OpeningOperationPlanDO;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -35,6 +37,7 @@ public class OpeningOperationPlanVO {
     private Byte routeCompleted;
 
     @ApiModelProperty("提交时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date submissionTime;
 
     @ApiModelProperty("提交人")
@@ -45,4 +48,16 @@ public class OpeningOperationPlanVO {
 
     @ApiModelProperty("审核结果,0待审核，1通过，2拒绝")
     private Integer resultType;
+
+    public OpeningOperationPlanVO(OpeningOperationPlanDO openingOperationPlanDO) {
+
+        this.resultType = openingOperationPlanDO.getResultType();
+        this.submittedUserId = openingOperationPlanDO.getSubmittedUserId();
+        this.submissionTime = openingOperationPlanDO.getSubmissionTime();
+        this.routeCompleted = openingOperationPlanDO.getRouteCompleted();
+        this.activityThemeUrl = openingOperationPlanDO.getActivityThemeUrl();
+        this.activityTheme = openingOperationPlanDO.getActivityTheme();
+        this.surveyResultUrl = openingOperationPlanDO.getSurveyResultUrl();
+        this.surveyResult = openingOperationPlanDO.getSurveyResult();
+    }
 }