装修接口
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
package com.cool.store.entity;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import javax.persistence.*;
|
||||
|
||||
@@ -127,7 +128,7 @@ public class AcceptanceInfoDO {
|
||||
@Column(name = "shop_interior_photo")
|
||||
private String shopInteriorPhoto;
|
||||
|
||||
/**满意度0-低,1-中,2-高', */
|
||||
/**满意度0-低,1-中,2-高', 3-差,4-一般,5-好,6-非常好*/
|
||||
@Column(name = "satisfaction")
|
||||
private Integer satisfaction;
|
||||
/**
|
||||
@@ -144,6 +145,28 @@ public class AcceptanceInfoDO {
|
||||
@Column(name = "back_kitchen_photo")
|
||||
private String backKitchenPhoto;
|
||||
|
||||
@Column(name = "add_reduce_amount")
|
||||
private BigDecimal addReduceAmount;
|
||||
|
||||
@Column(name = "delivery_order_id")
|
||||
private String deliveryOrderId;
|
||||
|
||||
public String getDeliveryOrderId() {
|
||||
return deliveryOrderId;
|
||||
}
|
||||
|
||||
public void setDeliveryOrderId(String deliveryOrderId) {
|
||||
this.deliveryOrderId = deliveryOrderId;
|
||||
}
|
||||
|
||||
public BigDecimal getAddReduceAmount() {
|
||||
return addReduceAmount;
|
||||
}
|
||||
|
||||
public void setAddReduceAmount(BigDecimal addReduceAmount) {
|
||||
this.addReduceAmount = addReduceAmount;
|
||||
}
|
||||
|
||||
public Boolean getIsNetworkCable() {
|
||||
return isNetworkCable;
|
||||
}
|
||||
|
||||
@@ -145,4 +145,8 @@ public class DecorationDesignInfoDO {
|
||||
private String quotationSheetId;
|
||||
@Column(name = "quoter")
|
||||
private String quoter;
|
||||
@Column(name = "construction_order_id")
|
||||
private String constructionOrderId;
|
||||
@Column(name = "actual_entry_time")
|
||||
private Date actualEntryTime;
|
||||
}
|
||||
@@ -89,11 +89,13 @@ public class DecorationMeasureDO {
|
||||
*/
|
||||
@Column(name = "deleted", nullable = false, columnDefinition = "tinyint default '0'")
|
||||
private Boolean deleted;
|
||||
|
||||
//测量派单ID
|
||||
@Column(name = "measurement_sheet_id")
|
||||
private String measurementSheetId;
|
||||
//测量员
|
||||
@Column(name = "measure_user_name")
|
||||
private String measureUserName;
|
||||
//设计组
|
||||
@Column(name = "design_leader_name")
|
||||
private String designLeaderName;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/23/18:40
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class ConfirmQuotationRequest {
|
||||
private String shopCode;
|
||||
private String quotationSheetId;
|
||||
@ApiModelProperty("0:拒绝,1:通过")
|
||||
private Integer status;
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/24/10:17
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class ConstructionCompletedRequest {
|
||||
@NotBlank(message = "门店编号不能为空")
|
||||
private String shopCode;
|
||||
@NotBlank(message = "施工派单编号不能为空")
|
||||
private String constructionOrderId;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/23/18:50
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class ConstructionOrderRequest {
|
||||
|
||||
@NotBlank(message = "门店编号不能为空")
|
||||
private String shopCode;
|
||||
@NotBlank(message = "施工派单ID(施工派单编号)不能为空")
|
||||
private String constructionOrderId;
|
||||
@NotBlank(message = "预计开工时间不能为空")
|
||||
private Date constructionPlanStartTime;
|
||||
@NotBlank(message = "预计完工时间不能为空")
|
||||
private Date constructionPlanEndTime;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/24/10:09
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class EntryConfirmationRequest {
|
||||
@NotBlank(message = "门店编号不能为空")
|
||||
private String shopCode;
|
||||
//施工派单ID(施工派单编号)
|
||||
@NotBlank(message = "施工派单编号不能为空")
|
||||
private String constructionOrderId;
|
||||
//进场时间
|
||||
@NotNull(message = "进场时间不能为空")
|
||||
private Date actualEntryTime;
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/23/18:36
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class HqtBuildRequest {
|
||||
private String shopCode;
|
||||
private String shopName;
|
||||
private Integer shopDecorationAttributes;
|
||||
private String hqtRegionCode;
|
||||
private String supervisorName;
|
||||
private String partnershipSignatoryFirst;
|
||||
private String partnershipSignatoryFirstMobile;
|
||||
private String shopAddress;
|
||||
private Integer isPayDesignFee;
|
||||
private Integer franchiseBrand;
|
||||
private String supervisorMobile;
|
||||
}
|
||||
@@ -0,0 +1,36 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotEmpty;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/24/10:46
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class HqtDecorationAcceptanceRequest {
|
||||
@NotBlank(message = "门店编号不能为空")
|
||||
private String shopCode;
|
||||
@NotBlank(message = "完工交付单ID (完工编号)不能为空")
|
||||
private String deliveryOrderId;
|
||||
@NotEmpty(message = "验收单不能为空")
|
||||
private List<String> acceptanceAttachmentUrl;
|
||||
@NotBlank(message = "门店门头照不能为空")
|
||||
private String shopDoorwayPhotoUrl;
|
||||
@NotBlank(message = "门店内景照不能为空")
|
||||
private String shopInteriorPhotoUrl;
|
||||
@NotBlank(message = "门店后厨照不能为空")
|
||||
private String backKitchenPhotoUrl;
|
||||
@NotNull(message = "验收日期不能为空")
|
||||
private Date actualAcceptanceTime;
|
||||
@NotNull(message = "增减项金额不能为空")
|
||||
private BigDecimal addReduceAmount;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.cool.store.request;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/24/11:25
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class HqtPartnerAcceptanceRequest {
|
||||
|
||||
private String shopCode;
|
||||
private Integer satisfaction;
|
||||
private String comment;
|
||||
}
|
||||
@@ -39,7 +39,7 @@ public class ThreeAcceptanceRequest {
|
||||
@ApiModelProperty("门店内景照片")
|
||||
private String shopInteriorPhoto;
|
||||
|
||||
@ApiModelProperty("满意度0-低,1-中,2-高',")
|
||||
@ApiModelProperty("满意度0-低,1-中,2-高', 3-差,4-一般,5-好,6-非常好")
|
||||
private Integer satisfaction;
|
||||
|
||||
@ApiModelProperty("网线安装 false-否 true-是")
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.cool.store.response;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/24/13:50
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class DecorationDesignResponse {
|
||||
|
||||
@ApiModelProperty(value = "设计派单ID")
|
||||
private String designSheetId;
|
||||
@ApiModelProperty(value = "设计组长名称")
|
||||
private String designLeaderName;
|
||||
@ApiModelProperty(value = "设计师名称")
|
||||
private String designName;
|
||||
@ApiModelProperty("设计图URL")
|
||||
private String designUrl;
|
||||
@ApiModelProperty(value = "原始照片")
|
||||
private String originalPhotoUrl;
|
||||
@ApiModelProperty(value = "效果图")
|
||||
private String renderingUrl;
|
||||
@ApiModelProperty(value = "平面布置图")
|
||||
private String floorPlanUrl;
|
||||
@ApiModelProperty(value = "设计最新提交时间")
|
||||
private Date designSubmitTime;
|
||||
@ApiModelProperty(value = "报价单ID(报价单编号)")
|
||||
private String quotationSheetId;
|
||||
@ApiModelProperty(value = "报价员")
|
||||
private String quoter;
|
||||
@ApiModelProperty(value = "报价单")
|
||||
private String quotationUrl;
|
||||
@ApiModelProperty(value = "报价提交时间")
|
||||
private Date quotationSubmitTime;
|
||||
@ApiModelProperty(value = "加盟商签字")
|
||||
private String partnerAcceptanceSignatures;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.cool.store.response;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Author: WangShuo
|
||||
* @Date: 2025/07/24/13:20
|
||||
* @Version 1.0
|
||||
* @注释:
|
||||
*/
|
||||
@Data
|
||||
public class MeasureResponse {
|
||||
|
||||
@ApiModelProperty("测量派单ID")
|
||||
private String measurementSheetId;
|
||||
|
||||
@ApiModelProperty("测量员")
|
||||
private String measureUserName;
|
||||
|
||||
@ApiModelProperty("设计组")
|
||||
private String designLeaderName;
|
||||
|
||||
@ApiModelProperty("测量日期")
|
||||
private Date measureDate;
|
||||
|
||||
@ApiModelProperty("出图日期")
|
||||
private Date diagramDate;
|
||||
|
||||
@ApiModelProperty("测量图附件")
|
||||
private String measureUrl;
|
||||
|
||||
@ApiModelProperty("最新提交时间")
|
||||
private Date submitTime;
|
||||
}
|
||||
@@ -4,6 +4,9 @@ import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Auther: WangShuo
|
||||
* @Date: 2024/05/06/下午5:50
|
||||
@@ -12,24 +15,27 @@ import lombok.Data;
|
||||
*/
|
||||
@Data
|
||||
public class ThreeSignResponse {
|
||||
@ApiModelProperty("工程部验收")
|
||||
private ThreeAcceptanceDTO engineeringAcceptance;
|
||||
@ApiModelProperty("完工交付单ID ")
|
||||
private String deliveryOrderId;
|
||||
// @ApiModelProperty("工程部验收")
|
||||
// private ThreeAcceptanceDTO engineeringAcceptance;
|
||||
@ApiModelProperty("营运部验收")
|
||||
private ThreeAcceptanceDTO operationsAcceptance;
|
||||
@ApiModelProperty("加盟商验收")
|
||||
private ThreeAcceptanceDTO partnerAcceptance;
|
||||
@ApiModelProperty("快手号")
|
||||
private String ksAccount;
|
||||
@ApiModelProperty("核销手机号")
|
||||
private String verificationPhone;
|
||||
@ApiModelProperty("高德、百度定位截图")
|
||||
private String shopLocationScreenshots;
|
||||
// @ApiModelProperty("快手号")
|
||||
// private String ksAccount;
|
||||
// @ApiModelProperty("核销手机号")
|
||||
// private String verificationPhone;
|
||||
// @ApiModelProperty("高德、百度定位截图")
|
||||
// private String shopLocationScreenshots;
|
||||
@ApiModelProperty("门店门头照片")
|
||||
private String shopDoorwayPhoto;
|
||||
|
||||
@ApiModelProperty("门店内景照片")
|
||||
private String shopInteriorPhoto;
|
||||
|
||||
@ApiModelProperty("满意度0-低,1-中,2-高',")
|
||||
@ApiModelProperty("满意度0-低,1-中,2-高', 3-差,4-一般,5-好,6-非常好")
|
||||
private Integer satisfaction;
|
||||
|
||||
@ApiModelProperty("网线安装 false-否 true-是")
|
||||
@@ -40,4 +46,9 @@ public class ThreeSignResponse {
|
||||
|
||||
@ApiModelProperty("后厨照片")
|
||||
private String backKitchenPhoto;
|
||||
@ApiModelProperty("验收时间")
|
||||
private Date actualAcceptanceTime;
|
||||
@ApiModelProperty("增减项金额")
|
||||
private BigDecimal addReduceAmount;
|
||||
|
||||
}
|
||||
|
||||
@@ -3,6 +3,8 @@ package com.cool.store.vo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
|
||||
/**
|
||||
* @Author suzhuhong
|
||||
@@ -12,14 +14,17 @@ import lombok.Data;
|
||||
@Data
|
||||
public class ConstructionDataVO {
|
||||
|
||||
@ApiModelProperty("施工派单id")
|
||||
private String constructionOrderId;
|
||||
|
||||
@ApiModelProperty("预计开工时间")
|
||||
private Long constructionPlanStartTime;
|
||||
private Date constructionPlanStartTime;
|
||||
|
||||
/**
|
||||
* 预计完工时间
|
||||
*/
|
||||
@ApiModelProperty("预计完工时间")
|
||||
private Long constructionPlanEndTime;
|
||||
private Date constructionPlanEndTime;
|
||||
|
||||
/**
|
||||
* 附件
|
||||
@@ -27,26 +32,7 @@ public class ConstructionDataVO {
|
||||
@ApiModelProperty("附件")
|
||||
private String constructionAnnex;
|
||||
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
private String constructionRemark;
|
||||
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@ApiModelProperty("创建时间")
|
||||
private Long constructionCreateTime;
|
||||
|
||||
/**
|
||||
* 创建人
|
||||
*/
|
||||
@ApiModelProperty("创建人")
|
||||
private String constructionCreateUser;
|
||||
|
||||
@ApiModelProperty("创建人")
|
||||
private String constructionCreateUserName;
|
||||
|
||||
@ApiModelProperty("进场时间")
|
||||
private Date actualEntryTime;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user