完成部分TODO修改bug

coolstore-partner-model/src/main/java/com/cool/store/entity/AcceptanceInfoDO.java

@@ -1,7 +1,4 @@
 package com.cool.store.entity;
-
-import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-
 import java.util.Date;
 import javax.persistence.*;
 
@@ -56,14 +53,12 @@ public class AcceptanceInfoDO {
     /**
      * 工程部验收签名 {"pic":"","acceptanceTime":"","result":"","remark":"","status":1}
      */
-
     @Column(name = "engineering_acceptance_signatures")
     private String engineeringAcceptanceSignatures;
 
     /**
      * 营运部验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":1}
      */
-
     @Column(name = "operations_acceptance_signatures")
     private String operationsAcceptanceSignatures;
     /**
@@ -88,6 +83,43 @@ public class AcceptanceInfoDO {
      * 是否删除：0.否 1.是
      */
     private Boolean deleted;
+    /**
+     * 计划验收时间
+     */
+    private Date planAcceptanceTime;
+
+    /**
+     * 实际验收时间
+     */
+    private Date actualAcceptanceTime;
+    /**
+     * 预约人
+     */
+    private String bookingUser;
+
+    public Date getPlanAcceptanceTime() {
+        return planAcceptanceTime;
+    }
+
+    public void setPlanAcceptanceTime(Date planAcceptanceTime) {
+        this.planAcceptanceTime = planAcceptanceTime;
+    }
+
+    public Date getActualAcceptanceTime() {
+        return actualAcceptanceTime;
+    }
+
+    public void setActualAcceptanceTime(Date actualAcceptanceTime) {
+        this.actualAcceptanceTime = actualAcceptanceTime;
+    }
+
+    public String getBookingUser() {
+        return bookingUser;
+    }
+
+    public void setBookingUser(String bookingUser) {
+        this.bookingUser = bookingUser;
+    }
 
     /**
      * @return id

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

@@ -0,0 +1,20 @@
+package com.cool.store.request;
+
+import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/05/09/下午5:27
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class AcceptanceListRequest {
+
+    private List<Integer> subStageStatus;
+    private Integer pageNum;
+    private Integer pageSize;
+}

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

@@ -15,7 +15,6 @@ import java.util.Date;
 @Data
 public class BookingAcceptanceRequest {
     private Long shopId;
-    @ApiModelProperty("预约验收实际")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty("预约验收时间")
     private Date bookingAcceptanceTime;
 }