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

修改bug

Browse Source
This commit is contained in:
shuo.wang
2024-05-06 15:46:08 +08:00
parent 09b05ae07c
commit e944de167c
10 changed files with 134 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/AssessmentDataDTO.java Normal file
View File

@@ -0,0 +1,42 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
/**
* @Auther: WangShuo
* @Date: 2024/05/06/下午3:31
* @Version 1.0
* @注释:
*/
@Data
public class AssessmentDataDTO {
@ApiModelProperty("模板id")
private Long templateId;
private Long shopId;
/**
* 店铺是否合格
*/
@ApiModelProperty("店铺是否合格，0合格1不合格")
private Boolean qualified;
/**
* 原因
*/
@ApiModelProperty("不合格原因")
private String reason;
/**
* 评语
*/
@ApiModelProperty("评语")
private String comments;
}

20
coolstore-partner-model/src/main/java/com/cool/store/dto/decoration/ThreeAcceptanceDTO.java Normal file
View File

@@ -0,0 +1,20 @@
package com.cool.store.dto.decoration;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Auther: WangShuo
* @Date: 2024/05/06/下午3:09
* @Version 1.0
* @注释:
*/
@Data
public class ThreeAcceptanceDTO {
@ApiModelProperty("验收签名 ")
private String AcceptanceSignatures;
@ApiModelProperty("验收评语")
private String Comments;
@ApiModelProperty("0通过，1不通过")
private Integer ResultType;
}

5
coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentDataDO.java
View File

@@ -1,6 +1,5 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@@ -21,28 +20,24 @@ public class AssessmentDataDO {
/**
* xfsg_assessment_template.id
*/
@ApiModelProperty("模板id")
@Column(name = "template_id")
private Long templateId;
/**
* xfsg_shop_info id
*/
@Column(name = "shop_id")
private Long shopId;
/**
* 考核人
*/
@ApiModelProperty("考核人")
@Column(name = "assessment_user_id")
private String assessmentUserId;
/**
* 店铺是否合格
*/
@ApiModelProperty("店铺是否合格，0合格1不合格")
private Boolean qualified;
/**

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

@@ -0,0 +1,21 @@
package com.cool.store.request;
import com.cool.store.dto.decoration.AssessmentDataDTO;
import com.cool.store.entity.AssessmentDataDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Auther: WangShuo
* @Date: 2024/05/06/下午3:17
* @Version 1.0
* @注释:
*/
@Data
public class ThreeAcceptanceCheckRequest {
private Long shopId;
@ApiModelProperty("检查项")
private List<AssessmentDataDTO> assessmentDataDTOS;
}

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

@@ -1,5 +1,6 @@
package com.cool.store.request;
import com.cool.store.dto.decoration.ThreeAcceptanceDTO;
import com.cool.store.entity.AssessmentDataDO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,24 +16,12 @@ import java.util.List;
@Data
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("营运部验收评语")
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 ThreeAcceptanceDTO engineeringAcceptance;
@ApiModelProperty("营运部验收")
private ThreeAcceptanceDTO operationsAcceptance;
@ApiModelProperty("加盟商验收")
private ThreeAcceptanceDTO partnerAcceptance;
@ApiModelProperty("检查项")
private List<AssessmentDataDO> assessmentDataDOS;
}