Merge remote-tracking branch 'hs/dev/feat/partner1.1_20230727' into dev/feat/partner1.1_20230727

2023-07-20 09:44:10 +08:00
parent 5a74bb43c7 5cd7195105
commit 6e5aad6f9d
20 changed files with 1008 additions and 9 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionRevocationDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionRevocationDTO.java
@@ -0,0 +1,25 @@
+package com.cool.store.dto.inspection.interview;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fun Li
+ * @version 1.0
+ * @date 2023/7/19 17:47
+ */
+@Data
+public class InspectionRevocationDTO {
+
+    @ApiModelProperty("稽核信息Id")
+    private Long inspectionId;
+
+    @ApiModelProperty("操作说明")
+    private String description;
+
+    @ApiModelProperty("多凭证文件链接集合")
+    private List<String> files;
+
+}
--- a/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionSubmissionDTO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/inspection/interview/InspectionSubmissionDTO.java
@@ -0,0 +1,29 @@
+package com.cool.store.dto.inspection.interview;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Fun Li
+ * @version 1.0
+ * @date 2023/7/19 17:05
+ */
+@Data
+public class InspectionSubmissionDTO {
+
+    @ApiModelProperty(value = "稽核信息表id", required = true)
+    private Long inspectionId;
+
+    @ApiModelProperty(value = "是否合格，0为不合格，1为合格", required = true)
+    private Integer whetherPass;
+
+    @ApiModelProperty("稽核说明，仅当不合格时为必传项")
+    private String description;
+
+    @ApiModelProperty("稽核多凭证文件链接")
+    private List<String> files;
+
+}
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspection.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspection.java
@@ -0,0 +1,166 @@
+package com.cool.store.entity;
+
+import java.time.LocalDateTime;
+
+public class HyInspection {
+    private Long id;
+
+    private Long interviewPlanId;
+
+    private String operatorUserId;
+
+    private Integer type;
+
+    private Integer status;
+
+    private String files;
+
+    private String description;
+
+    private String inspectionTime;
+
+    private String creator;
+
+    private String updator;
+
+    private String remark;
+
+    private Boolean deleted;
+
+    private String createTime;
+
+    private String updateTime;
+
+    public HyInspection(Long id, Long interviewPlanId, String operatorUserId, Integer type, Integer status, String files, String description, String inspectionTime, String creator, String updator, String remark, Boolean deleted, String createTime, String updateTime) {
+        this.id = id;
+        this.interviewPlanId = interviewPlanId;
+        this.operatorUserId = operatorUserId;
+        this.type = type;
+        this.status = status;
+        this.files = files;
+        this.description = description;
+        this.inspectionTime = inspectionTime;
+        this.creator = creator;
+        this.updator = updator;
+        this.remark = remark;
+        this.deleted = deleted;
+        this.createTime = createTime;
+        this.updateTime = updateTime;
+    }
+
+    public HyInspection() {
+        super();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getInterviewPlanId() {
+        return interviewPlanId;
+    }
+
+    public void setInterviewPlanId(Long interviewPlanId) {
+        this.interviewPlanId = interviewPlanId;
+    }
+
+    public String getOperatorUserId() {
+        return operatorUserId;
+    }
+
+    public void setOperatorUserId(String operatorUserId) {
+        this.operatorUserId = operatorUserId == null ? null : operatorUserId.trim();
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getFiles() {
+        return files;
+    }
+
+    public void setFiles(String files) {
+        this.files = files == null ? null : files.trim();
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public String getInspectionTime() {
+        return inspectionTime;
+    }
+
+    public void setInspectionTime(String inspectionTime) {
+        this.inspectionTime = inspectionTime;
+    }
+
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator == null ? null : creator.trim();
+    }
+
+    public String getUpdator() {
+        return updator;
+    }
+
+    public void setUpdator(String updator) {
+        this.updator = updator == null ? null : updator.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Boolean getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Boolean deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyIntendDevelopementMappingDO.java
@@ -22,7 +22,7 @@ public class HyIntendDevelopementMappingDO implements Serializable {
    private Long id;

    @ApiModelProperty("hy_intend_developement_zone_info.id")
-    private String mappingId;
+    private Long mappingId;

    @ApiModelProperty("hy_open_area_info.id或者区域ID")
    private String openAreaMappingId;
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLog.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLog.java
@@ -0,0 +1,120 @@
+package com.cool.store.entity;
+
+public class HyInterviewInspectionLog {
+    private Long id;
+
+    private String operatorUserId;
+
+    private Long inspectionId;
+
+    private Integer operationType;
+
+    private String description;
+
+    private String files;
+
+    private String operationTime;
+
+    private String remark;
+
+    private String createTime;
+
+    private String updateTime;
+
+    public HyInterviewInspectionLog(Long id, String operatorUserId, Long inspectionId, Integer operationType, String description, String files, String operationTime, String remark, String createTime, String updateTime) {
+        this.id = id;
+        this.operatorUserId = operatorUserId;
+        this.inspectionId = inspectionId;
+        this.operationType = operationType;
+        this.description = description;
+        this.files = files;
+        this.operationTime = operationTime;
+        this.remark = remark;
+        this.createTime = createTime;
+        this.updateTime = updateTime;
+    }
+
+    public HyInterviewInspectionLog() {
+        super();
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getOperatorUserId() {
+        return operatorUserId;
+    }
+
+    public void setOperatorUserId(String operatorUserId) {
+        this.operatorUserId = operatorUserId == null ? null : operatorUserId.trim();
+    }
+
+    public Long getInspectionId() {
+        return inspectionId;
+    }
+
+    public void setInspectionId(Long inspectionId) {
+        this.inspectionId = inspectionId;
+    }
+
+    public Integer getOperationType() {
+        return operationType;
+    }
+
+    public void setOperationType(Integer operationType) {
+        this.operationType = operationType;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description == null ? null : description.trim();
+    }
+
+    public String getFiles() {
+        return files;
+    }
+
+    public void setFiles(String files) {
+        this.files = files == null ? null : files.trim();
+    }
+
+    public String getOperationTime() {
+        return operationTime;
+    }
+
+    public void setOperationTime(String operationTime) {
+        this.operationTime = operationTime;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime == null ? null : createTime.trim();
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(String updateTime) {
+        this.updateTime = updateTime;
+    }
+}