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

员工考核

Browse Source
This commit is contained in:
bianyadong
2024-05-06 15:59:54 +08:00
parent e26183b764
commit 7d98d786f1
18 changed files with 575 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
coolstore-partner-model/src/main/java/com/cool/store/entity/EmployeeTrainingDO.java
View File

@@ -99,7 +99,7 @@ public class EmployeeTrainingDO {
* 理论考试状态 0-未开始 1-合格 2-不合格
*/
@Column(name = "theoretical_exam_status")
private Byte theoreticalExamStatus;
private Integer theoreticalExamStatus;
/**
* 理论考试分值
@@ -111,7 +111,7 @@ public class EmployeeTrainingDO {
* 实操考试状态 0-未开始 1-合格 2-不合格
*/
@Column(name = "practical_exam_status")
private Byte practicalExamStatus;
private Integer practicalExamStatus;
/**
* 实操考试分值
@@ -123,7 +123,7 @@ public class EmployeeTrainingDO {
* 考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过
*/
@Column(name = "assessment_status")
private Byte assessmentStatus;
private Integer assessmentStatus;
/**
* 创建时间

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

@@ -0,0 +1,20 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author byd
* @date 2024-04-30 17:30
*/
@Data
public class EmployeeAssessmentCommitListRequest {
@ApiModelProperty("培训id")
private Long employeeTrainingId;
@ApiModelProperty("培训考核结果列表")
List<EmployeeAssessmentCommitRequest> list;
}

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

@@ -0,0 +1,27 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author byd
* @date 2024-04-30 11:10
*/
@Data
public class EmployeeAssessmentCommitRequest {
@ApiModelProperty("数据项id")
private Long id;
@ApiModelProperty("模版id")
private Long templateId;
@ApiModelProperty("店铺id")
private Long shopId;
@ApiModelProperty("得分")
private Long score;
@ApiModelProperty("评语")
private String comments;
}

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

@@ -0,0 +1,37 @@
package com.cool.store.request;
import com.cool.store.common.PageBasicInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @author byd
* @date 2024-04-30 11:10
*/
@Data
public class EmployeeAssessmentRequest extends PageBasicInfo {
@ApiModelProperty("姓名")
private String name;
@ApiModelProperty("预计考核时间-开始")
private Long estimatedAssessmentBeginTime;
@ApiModelProperty("预计考核时间-结束")
private Long estimatedAssessmentEndTime;
@ApiModelProperty("实际考核时间-开始")
private Long actualAssessmentBeginTime;
@ApiModelProperty("实际考核时间-结束")
private Long actualAssessmentEndTime;
@ApiModelProperty("实训门店id列表")
private List<String> storeIdList;
@ApiModelProperty("考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过")
private Integer assessmentStatus;
}

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

@@ -0,0 +1,20 @@
package com.cool.store.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author byd
* @date 2024-04-30 11:10
*/
@Data
public class EmployeeAssessmentTurnRequest {
@ApiModelProperty("员工id")
private Long id;
@ApiModelProperty("转交人id")
private String turnUserId;
}

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

@@ -10,9 +10,11 @@ import lombok.Data;
@Data
public class EmployeeTrainingCommitRequest {
@ApiModelProperty("数据项id")
private Long id;
@ApiModelProperty("模版id")
private Long templateId;
private Long templateId;
@ApiModelProperty("店铺id")
private Long shopId;
@@ -25,6 +27,4 @@ public class EmployeeTrainingCommitRequest {
*/
@ApiModelProperty("店铺是否合格")
private Boolean qualified;
}

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

@@ -0,0 +1,110 @@
package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
import java.util.List;
/**
* @author byd
* @date 2024-04-30 10:53
*/
@Data
public class AssessmentUserTrainingVO {
@ApiModelProperty("id")
private Long id;
@ApiModelProperty("名字")
private String username;
@ApiModelProperty("手机号")
private String mobile;
@ApiModelProperty("身份证号")
private String idCard;
@ApiModelProperty("区域id")
private Long regionId;
@ApiModelProperty("角色id 170000000-店长 180000000-店员")
private Long roleId;
@ApiModelProperty("店铺id")
private Long shopId;
@ApiModelProperty("店铺名称")
private String shopName;
@ApiModelProperty("培训id")
private Long employeeTrainingId;
/**
* 实训门店ID
*/
@ApiModelProperty("实训门店ID")
private String trainingStoreId;
/**
* 实训门店ID
*/
@ApiModelProperty("实训门店名称")
private String trainingStoreName;
/**
* 实操考核人员ID
*/
@ApiModelProperty("实操考核人员ID")
private String practicalAssessmentUserId;
@ApiModelProperty("实操考核人员名称")
private String practicalAssessmentUserName;
/**
* 预计考核时间
*/
@ApiModelProperty("预计考核时间")
private Date estimatedAssessmentTime;
/**
* 实际考核时间
*/
@ApiModelProperty("实际考核时间")
private Date actualAssessmentTime;
/**
* 理论考试状态 0-未开始 1-合格 2-不合格
*/
@ApiModelProperty("理论考试状态 0-未开始 1-合格 2-不合格")
private Integer theoreticalExamStatus;
/**
* 理论考试分值
*/
@ApiModelProperty("理论考试分值")
private Integer theoreticalExamScore;
/**
* 实操考试分值
*/
@ApiModelProperty("实操考试分值")
private Integer practicalExamScore;
@ApiModelProperty("实操考试状态")
private Integer practicalExamStatus;
/**
* 考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过
*/
@ApiModelProperty("核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过")
private Integer assessmentStatus;
@ApiModelProperty("考核数据")
List<AssessmentTemplateDataVO> templateDataList;
}

6
coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingDetailVO.java
View File

@@ -130,7 +130,7 @@ public class EmployeeTrainingDetailVO {
* 理论考试状态 0-未开始 1-合格 2-不合格
*/
@ApiModelProperty("理论考试状态 0-未开始 1-合格 2-不合格")
private Byte theoreticalExamStatus;
private Integer theoreticalExamStatus;
/**
* 理论考试分值
@@ -142,7 +142,7 @@ public class EmployeeTrainingDetailVO {
* 实操考试状态 0-未开始 1-合格 2-不合格
*/
@ApiModelProperty("实操考试状态 0-未开始 1-合格 2-不合格")
private Byte practicalExamStatus;
private Integer practicalExamStatus;
/**
* 实操考试分值
@@ -154,6 +154,6 @@ public class EmployeeTrainingDetailVO {
* 考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过
*/
@ApiModelProperty("考核状态 0-培训中 1-带考核 2-考核通过 3-考核不通过")
private Byte assessmentStatus;
private Integer assessmentStatus;
}

12
coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeTrainingVO.java
View File

@@ -3,6 +3,7 @@ package com.cool.store.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Column;
import java.util.Date;
/**
@@ -107,4 +108,15 @@ public class EmployeeTrainingVO {
@ApiModelProperty("实操考核人员名称")
private String practicalAssessmentUserName;
/**
* 预计考核时间
*/
@ApiModelProperty("预计考核时间")
private Date estimatedAssessmentTime;
/**
* 实际考核时间
*/
@ApiModelProperty("实际考核时间")
private Date actualAssessmentTime;
}