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

Merge branch 'dev/feat/partner1.1_20230727' into hxd/feat/interviewSelect

Browse Source 
# Conflicts:
#	coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyInterviewInspectionLogMapper.java
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewInspectionServiceImpl.java
This commit is contained in:
xiaodong.hu
2023-07-21 17:12:35 +08:00
parent dc8f27a365 cd607517da
commit 6e7eef3457
28 changed files with 467 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspection.java
View File

@@ -1,164 +0,0 @@
package com.cool.store.entity;
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;
}
}

57
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInspectionDO.java Normal file
View File

@@ -0,0 +1,57 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class HyInspectionDO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("面试计划Id")
private Long interviewPlanId;
@ApiModelProperty("稽核人user_id")
private String operatorUserId;
@ApiModelProperty("稽核类型，0面试稽核，后续可能有其他稽核")
private Integer type;
@ApiModelProperty("稽核状态（0为未稽核，1为合格，2为不合格）")
private Integer status;
@ApiModelProperty("多个凭证文件（以英文逗号分隔）")
private String files;
@ApiModelProperty("稽核说明")
private String description;
@ApiModelProperty("稽核时间")
private String inspectionTime;
@ApiModelProperty("enterprise_user.user_id，创建人")
private String creator;
@ApiModelProperty("enterprise_user.user_id，修改人")
private String updator;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否删除（0表示未删除，1表示删除）")
private Boolean deleted;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("修改时间")
private String updateTime;
}

120
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLog.java
View File

@@ -1,120 +0,0 @@
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;
}
}

44
coolstore-partner-model/src/main/java/com/cool/store/entity/HyInterviewInspectionLogDO.java Normal file
View File

@@ -0,0 +1,44 @@
package com.cool.store.entity;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class HyInterviewInspectionLogDO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("enterprise_user.user_id，操作人用户id")
private String operatorUserId;
@ApiModelProperty("稽核信息表id(hy_inspection.id)")
private Long inspectionId;
@ApiModelProperty("操作类型（0为合格，1为不合格，2为撤销）")
private Integer operationType;
@ApiModelProperty("操作说明")
private String description;
@ApiModelProperty("多个凭证文件，以英文逗号分隔")
private String files;
@ApiModelProperty("操作时间")
private String operationTime;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("创建时间")
private String createTime;
@ApiModelProperty("修改时间")
private String updateTime;
}

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

@@ -0,0 +1,13 @@
package com.cool.store.request;
import lombok.Data;
/**
* @Author: young.yu
* @Date: 2023-06-21 11:17
* @Description:
*/
@Data
public class IntentSmsReq {
private String deadLine;
}

4
coolstore-partner-model/src/main/java/com/cool/store/vo/inspection/setting/InspectionSettingPageVO.java
View File

@@ -37,7 +37,7 @@ public class InspectionSettingPageVO {
private Date updateTime;
@ApiModelProperty("更新人名称")
private String updateUsername;
private String updateUserName;
/**
* dto转vo
@@ -57,7 +57,7 @@ public class InspectionSettingPageVO {
result.setInspectionUserId(inspectionSetting.getInspectionUserId());
result.setInspectionUserName(userNameMap.get(inspectionSetting.getInspectionUserId()));
result.setUpdateTime(inspectionSetting.getUpdateTime());
result.setUpdateUsername(userNameMap.get(inspectionSetting.getUpdateUserId()));
result.setUpdateUserName(userNameMap.get(inspectionSetting.getUpdateUserId()));
resultList.add(result);
}
return resultList;

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

@@ -98,7 +98,7 @@ public class InterviewVO {
private Integer status;
@ApiModelProperty(value = "面试过程信息视频URL数组", required = true)
private List<String> vedioList;
private List<String> videoList;
@ApiModelProperty(value = "面试过程信息未解析String", required = false)
private String processInfo;