Merge remote-tracking branch 'origin/cc_partner_init' into cc_partner_init

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java

@@ -17,22 +17,19 @@ import javax.persistence.Id;
 @Data
 public class AssessmentDataDTO {
 
+
     @ApiModelProperty("模板id")
     private Long templateId;
-
-    private Long shopId;
     /**
      * 店铺是否合格
      */
     @ApiModelProperty("店铺是否合格，0合格1不合格")
     private Boolean qualified;
-
     /**
      * 原因
      */
     @ApiModelProperty("不合格原因")
     private String reason;
-
     /**
      * 评语
      */

coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ThreeAcceptanceDTO.java

@@ -12,9 +12,11 @@ import lombok.Data;
 @Data
 public class ThreeAcceptanceDTO {
     @ApiModelProperty("验收签名 ")
-    private String AcceptanceSignatures;
+    private String acceptanceSignatures;
     @ApiModelProperty("验收评语")
-    private String Comments;
+    private String comments;
     @ApiModelProperty("0通过，1不通过")
-    private Integer ResultType;
+    private Integer resultType;
+    @ApiModelProperty("验收时间")
+    private String acceptanceTime;
 }

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

@@ -1,5 +1,7 @@
 package com.cool.store.entity;
 
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
 import java.util.Date;
 import javax.persistence.*;
 
@@ -54,15 +56,16 @@ 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;
-
     /**
      * 加密商验收签名  {"pic":"","acceptanceTime":"","result":"","remark":"","status":0}
      */

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

@@ -22,6 +22,4 @@ public class ThreeAcceptanceRequest {
     private ThreeAcceptanceDTO operationsAcceptance;
     @ApiModelProperty("加盟商验收")
     private ThreeAcceptanceDTO partnerAcceptance;
-    @ApiModelProperty("检查项")
-    private List<AssessmentDataDO> assessmentDataDOS;
 }

coolstore-partner-model/src/main/java/com/cool/store/response/ThreeSignResponse.java

@@ -0,0 +1,21 @@
+package com.cool.store.response;
+
+import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Auther: WangShuo
+ * @Date: 2024/05/06/下午5:50
+ * @Version 1.0
+ * @注释:
+ */
+@Data
+public class ThreeSignResponse {
+    @ApiModelProperty("工程部验收")
+    private ThreeAcceptanceDTO engineeringAcceptance;
+    @ApiModelProperty("营运部验收")
+    private ThreeAcceptanceDTO operationsAcceptance;
+    @ApiModelProperty("加盟商验收")
+    private ThreeAcceptanceDTO partnerAcceptance;
+}