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
2024-05-05 21:03:12 +08:00
parent 3bd749a622
commit 6a39b8c10f
26 changed files with 699 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAuditInfoDO.java
View File

@@ -19,10 +19,10 @@ public class ShopAuditInfoDO {
private Long shopId;
/**
* 0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批
* '0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 4-系统建店5-三方验收
*/
@Column(name = "audit_type")
@ApiModelProperty("0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批")
@ApiModelProperty("'0-视觉验收 1-培训登记审批 2-开业运营方案 3-证照审批 4-系统建店5-三方验收")
private Integer auditType;
/**

21
coolstore-partner-model/src/main/java/com/cool/store/request/BookingAcceptanceRequest.java Normal file
View File

@@ -0,0 +1,21 @@
package com.cool.store.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Auther: WangShuo
* @Date: 2024/05/03/下午7:30
* @Version 1.0
* @注释:
*/
@Data
public class BookingAcceptanceRequest {
private Long shopId;
@ApiModelProperty("预约验收实际")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date bookingAcceptanceTime;
}

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

@@ -1,8 +1,11 @@
package com.cool.store.request;
import com.cool.store.entity.AssessmentDataDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/04/29/下午11:35
@@ -14,8 +17,22 @@ public class ThreeAcceptanceRequest {
private Long shopId;
@ApiModelProperty("工程部验收签名 {pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
private String engineeringAcceptanceSignatures;
@ApiModelProperty("工程部验收评语")
private String engineeringComments;
@ApiModelProperty("0通过，1不通过")
private Integer engineeringResultType;
@ApiModelProperty("营运部验收签名 {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":1}")
private String operationsAcceptanceSignatures;
@ApiModelProperty("加密商验收签名 {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":0}")
@ApiModelProperty("营运部验收评语")
private String operationsComments;
@ApiModelProperty("0通过，1不通过")
private Integer operationsResultType;
@ApiModelProperty("加盟商验收签名 {\"pic\":\"\",\"acceptanceTime\":\"\",\"result\":\"\",\"remark\":\"\",\"status\":0}")
private String partnerAcceptanceSignatures;
@ApiModelProperty("加盟商验收评语")
private String partnerComments;
@ApiModelProperty("0通过，1不通过")
private Integer partnerResultType;
@ApiModelProperty("检查项")
private List<AssessmentDataDO> assessmentDataDOS;
}

19
coolstore-partner-model/src/main/java/com/cool/store/response/FitmentResponse.java Normal file
View File

@@ -0,0 +1,19 @@
package com.cool.store.response;
import com.cool.store.vo.Fitment.DecorationStageVO;
import com.cool.store.vo.shop.ShopStageInfoVO;
import lombok.Data;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/05/03/下午1:03
* @Version 1.0
* @注释:
*/
@Data
public class FitmentResponse {
private Long shopId;
private List<DecorationStageVO> stageInfoList;
}

2
coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModelVO.java
View File

@@ -15,7 +15,7 @@ import java.util.Date;
@Data
public class DecorationModelVO {
@ApiModelProperty("支付状态 45:待缴费 50:已缴费 55缴费失败")
private Integer payStatus;
private Byte payStatus;
@ApiModelProperty("付款人姓名/加盟商姓名")
private String payUserName;
@ApiModelProperty("付款账号")

13
coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationModeStageVO.java → coolstore-partner-model/src/main/java/com/cool/store/vo/Fitment/DecorationStageVO.java
View File

@@ -2,6 +2,7 @@ package com.cool.store.vo.Fitment;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.models.auth.In;
import lombok.Data;
import java.util.Date;
@@ -12,10 +13,20 @@ import java.util.Date;
* @注释:
*/
@Data
public class DecorationModeStageVO {
public class DecorationStageVO {
@ApiModelProperty("阶段name")
private String shopSubStageName;
@ApiModelProperty("店铺子阶段")
private Integer shopSubStage;
@ApiModelProperty("装修阶段状态")
private Integer shopSubStageStatus;
@ApiModelProperty("创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date creatTime;
@ApiModelProperty("计划开始时间")
private String planBeginTime;
@ApiModelProperty("计划结束时间")
private String planEndTime;
@ApiModelProperty("实际完成时间")
private String actualCompleteTime;
}

53
coolstore-partner-model/src/main/java/com/cool/store/vo/fitmentCheckVO.java Normal file
View File

@@ -0,0 +1,53 @@
package com.cool.store.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
/**
* @Auther: WangShuo
* @Date: 2024/05/03/下午3:21
* @Version 1.0
* @注释:
*/
@Data
public class fitmentCheckVO {
private Long shopId;
private Long lineId;
private String shopName;
private String storeNum;
@ApiModelProperty("加盟商姓名")
private String partnerName;
@ApiModelProperty("所属战区id")
private Long regionId;
@ApiModelProperty("所属战区")
private String region;
@ApiModelProperty("招商经理id")
private String investmentManagerId;
@ApiModelProperty("招商经理")
private String investmentManager;
@ApiModelProperty("门店选址人id")
private String sitterId;
@ApiModelProperty("门店选址人姓名")
private String sitterName;
@ApiModelProperty("战区经理id")
private String fightManagerId;
@ApiModelProperty("战区经理")
private String fightManager;
@ApiModelProperty("计划完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planEndTime;
@ApiModelProperty("实际完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actualEndTime;
@ApiModelProperty("计划验收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date planAcceptanceTime;
@ApiModelProperty("实际验收时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date acceptanceTime;
@ApiModelProperty("验收状态：三方验收1200待预约，1210 待验收，1220验收中，1230已验收；视觉验收：1300待验收,1310验收不通过,1320验收通过")
private Integer shopSubStageStatus;
}