suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

装修调整

Browse Source
This commit is contained in:
shuo.wang
2025-08-06 17:42:34 +08:00
parent b592d793f2
commit 71591e985a
24 changed files with 123 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
coolstore-partner-model/src/main/java/com/cool/store/request/AssignDesignerRequest.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.request;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Author: WangShuo
@@ -13,8 +14,8 @@ import javax.validation.constraints.NotBlank;
@Data
public class AssignDesignerRequest {
@NotBlank(message = "店铺编号不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotBlank(message = "设计派单ID不能为空")
private String designSheetId;
@NotBlank(message = "设计师不能为空")

5
coolstore-partner-model/src/main/java/com/cool/store/request/AssignQuotationRequest.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.request;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Author: WangShuo
@@ -13,8 +14,8 @@ import javax.validation.constraints.NotBlank;
@Data
public class AssignQuotationRequest {
@NotBlank(message = "门店编号不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotBlank(message = "报价单编码不能为空")
private String quotationSheetId;
@NotBlank(message = "报价员不能为空")

5
coolstore-partner-model/src/main/java/com/cool/store/request/AssignSurveyorsRequest.java
View File

@@ -14,9 +14,8 @@ import javax.validation.constraints.NotNull;
*/
@Data
public class AssignSurveyorsRequest {
@NotBlank(message = "门店编码不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@ApiModelProperty("测量单ID")
@NotBlank(message = "测量单ID不能为空")
private String measurementSheetId;

5
coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionCompletedRequest.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.request;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* @Author: WangShuo
@@ -12,8 +13,8 @@ import javax.validation.constraints.NotBlank;
*/
@Data
public class ConstructionCompletedRequest {
@NotBlank(message = "门店编号不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotBlank(message = "施工派单编号不能为空")
private String constructionOrderId;
}

4
coolstore-partner-model/src/main/java/com/cool/store/request/ConstructionOrderRequest.java
View File

@@ -15,8 +15,8 @@ import java.util.Date;
@Data
public class ConstructionOrderRequest {
@NotBlank(message = "门店编号不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotBlank(message = "施工派单ID(施工派单编号)不能为空")
private String constructionOrderId;

3
coolstore-partner-model/src/main/java/com/cool/store/request/DecorationDesignRequest.java
View File

@@ -23,6 +23,9 @@ public class DecorationDesignRequest {
@ApiModelProperty("店铺ID")
private Long shopId;
@ApiModelProperty(value = "设计派单ID")
private String designSheetId;
@ApiModelProperty("设计组长ID")
private String designLeaderId;

6
coolstore-partner-model/src/main/java/com/cool/store/request/DecorationMeasureRequest.java
View File

@@ -38,6 +38,11 @@ public class DecorationMeasureRequest {
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("测量派单ID")
private String measurementSheetId;
/**
* 构建DecorationMeasureDO
*
@@ -52,6 +57,7 @@ public class DecorationMeasureRequest {
decorationMeasureDO.setDiagramDate(this.diagramDate);
decorationMeasureDO.setMeasureUrl(this.measureUrl);
decorationMeasureDO.setRemark(this.remark);
decorationMeasureDO.setMeasurementSheetId(this.measurementSheetId);
return decorationMeasureDO;
}

4
coolstore-partner-model/src/main/java/com/cool/store/request/EntryConfirmationRequest.java
View File

@@ -14,8 +14,8 @@ import java.util.Date;
*/
@Data
public class EntryConfirmationRequest {
@NotBlank(message = "门店编号不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
//施工派单ID(施工派单编号)
@NotBlank(message = "施工派单编号不能为空")
private String constructionOrderId;

4
coolstore-partner-model/src/main/java/com/cool/store/request/HqtDecorationAcceptanceRequest.java
View File

@@ -17,8 +17,8 @@ import java.util.List;
*/
@Data
public class HqtDecorationAcceptanceRequest {
@NotBlank(message = "门店编号不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotBlank(message = "完工交付单ID (完工编号)不能为空")
private String deliveryOrderId;
@NotEmpty(message = "验收单不能为空")

7
coolstore-partner-model/src/main/java/com/cool/store/request/SubmitDesignDrawingRequest.java
View File

@@ -4,6 +4,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -14,10 +15,8 @@ import java.util.List;
*/
@Data
public class SubmitDesignDrawingRequest {
@NotBlank(message = "门店编号不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotBlank(message = "设计派单ID不能为空")
private String designSheetId;

4
coolstore-partner-model/src/main/java/com/cool/store/request/SubmitMeasurementRequest.java
View File

@@ -17,8 +17,8 @@ import java.util.List;
@Data
public class SubmitMeasurementRequest {
@NotBlank(message = "门店编码不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotNull(message = "测量日期不能为空")
private Date measureDate;
@NotNull(message = "出图日期不能为空")

5
coolstore-partner-model/src/main/java/com/cool/store/request/SubmitQuotationSheetRequest.java
View File

@@ -4,6 +4,7 @@ import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
@@ -14,8 +15,8 @@ import java.util.List;
*/
@Data
public class SubmitQuotationSheetRequest {
@NotBlank(message = "门店编码不能为空")
private String shopCode;
@NotNull(message = "crm门店id不能为空")
private Long shopId;
@NotBlank(message = "报价单ID(报价单编号)不能为空")
private String quotationSheetId;
@NotEmpty(message = "报价单附件不能为空")

4
coolstore-partner-model/src/main/java/com/cool/store/request/hqt/HqtBuildAPIRequest.java
View File

@@ -91,6 +91,10 @@ public class HqtBuildAPIRequest {
@JsonProperty("field4__c")
private String field4__c;
//是否对接CRM
@JsonProperty("field180__c")
private String field180__c = "crm";
@Data
public static class Field124__c {
/**

3
coolstore-partner-model/src/main/java/com/cool/store/response/DecorationDesignResponse.java
View File

@@ -19,8 +19,10 @@ public class DecorationDesignResponse {
private String designSheetId;
@ApiModelProperty(value = "设计组长名称")
private String designLeaderName;
private String designLeaderId;
@ApiModelProperty(value = "设计师名称")
private String designName;
private String designUserId;
@ApiModelProperty("设计图URL")
private String designUrl;
@ApiModelProperty(value = "原始照片")
@@ -35,6 +37,7 @@ public class DecorationDesignResponse {
private String quotationSheetId;
@ApiModelProperty(value = "报价员")
private String quoter;
private String quotationUserId;
@ApiModelProperty(value = "报价单")
private String quotationUrl;
@ApiModelProperty(value = "报价提交时间")

4
coolstore-partner-model/src/main/java/com/cool/store/response/MeasureResponse.java
View File

@@ -21,9 +21,13 @@ public class MeasureResponse {
@ApiModelProperty("测量员")
private String measureUserName;
private String measureUserId;
@ApiModelProperty("设计组")
private String designLeaderName;
private String designUserId;
@ApiModelProperty("测量日期")
private Date measureDate;