员工培训

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

@@ -55,4 +55,8 @@ public class AssessmentDataDO {
      */
     private String comments;
 
+    private String picture;
+
+    private String video;
+
 }

coolstore-partner-model/src/main/java/com/cool/store/entity/AssessmentTemplateDO.java

@@ -1,7 +1,10 @@
 package com.cool.store.entity;
 
+import lombok.Data;
+
 import javax.persistence.*;
 
+@Data
 @Table(name = "xfsg_assessment_template")
 public class AssessmentTemplateDO {
     @Id
@@ -41,125 +44,6 @@ public class AssessmentTemplateDO {
     @Column(name = "template_requirements")
     private String templateRequirements;
 
-    /**
-     * @return id
-     */
-    public Long getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收
-     *
-     * @return type - 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收
-     */
-    public Integer getType() {
-        return type;
-    }
-
-    /**
-     * 设置模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收
-     *
-     * @param type 模板类型：0 - 教练员, 1 - 店长, 2 - 店员, 3 - 三方验收
-     */
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    /**
-     * 获取模板类别，可为空
-     *
-     * @return category - 模板类别，可为空
-     */
-    public String getCategory() {
-        return category;
-    }
-
-    /**
-     * 设置模板类别，可为空
-     *
-     * @param category 模板类别，可为空
-     */
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    /**
-     * 获取模板名称
-     *
-     * @return template_name - 模板名称
-     */
-    public String getTemplateName() {
-        return templateName;
-    }
-
-    /**
-     * 设置模板名称
-     *
-     * @param templateName 模板名称
-     */
-    public void setTemplateName(String templateName) {
-        this.templateName = templateName;
-    }
-
-    /**
-     * 获取模板remark
-     *
-     * @return template_remark - 模板remark
-     */
-    public String getTemplateRemark() {
-        return templateRemark;
-    }
-
-    /**
-     * 设置模板remark
-     *
-     * @param templateRemark 模板remark
-     */
-    public void setTemplateRemark(String templateRemark) {
-        this.templateRemark = templateRemark;
-    }
-
-    /**
-     * 获取考核项分值
-     *
-     * @return score - 考核项分值
-     */
-    public Long getScore() {
-        return score;
-    }
-
-    /**
-     * 设置考核项分值
-     *
-     * @param score 考核项分值
-     */
-    public void setScore(Long score) {
-        this.score = score;
-    }
-
-    /**
-     * 获取模板要求明细，包括详细的考核要求描述
-     *
-     * @return template_requirements - 模板要求明细，包括详细的考核要求描述
-     */
-    public String getTemplateRequirements() {
-        return templateRequirements;
-    }
-
-    /**
-     * 设置模板要求明细，包括详细的考核要求描述
-     *
-     * @param templateRequirements 模板要求明细，包括详细的考核要求描述
-     */
-    public void setTemplateRequirements(String templateRequirements) {
-        this.templateRequirements = templateRequirements;
-    }
+    @Column(name = "check_type")
+    private String checkType;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/EmployeeAssessmentCommitRequest.java

@@ -24,4 +24,10 @@ public class EmployeeAssessmentCommitRequest {
 
     @ApiModelProperty("评语")
     private String comments;
+
+    @ApiModelProperty("图片")
+    private String picture;
+
+    @ApiModelProperty("视频")
+    private String video;
 }

coolstore-partner-model/src/main/java/com/cool/store/request/EmployeeTrainingCommitListRequest.java

@@ -12,6 +12,9 @@ import java.util.List;
 @Data
 public class EmployeeTrainingCommitListRequest {
 
+    @ApiModelProperty("员工id")
+    private Long userDetailId;
+
     @ApiModelProperty("培训结果列表")
     List<EmployeeTrainingCommitRequest> list;
 }

coolstore-partner-model/src/main/java/com/cool/store/vo/AssessmentTemplateDataVO.java

@@ -80,5 +80,12 @@ public class AssessmentTemplateDataVO {
     @ApiModelProperty("评语")
     private String comments;
 
+    @ApiModelProperty("考核方式")
+    private String checkType;
 
+    @ApiModelProperty("图片")
+    private String picture;
+
+    @ApiModelProperty("视频")
+    private String video;
 }

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

@@ -70,6 +70,12 @@ public class EmployeeTrainingVO {
     @ApiModelProperty("实训结束时间")
     private Date trainingEndTime;
 
+    /**
+     * 实训结束时间
+     */
+    @ApiModelProperty("实训开始时间")
+    private Date trainingStartTime;
+
     /**
      * 实训门店ID
      */

coolstore-partner-model/src/main/java/com/cool/store/vo/EmployeeUserTrainingVO.java

@@ -35,7 +35,7 @@ public class EmployeeUserTrainingVO {
     private Long shopId;
 
     @ApiModelProperty("店铺名称")
-    private Long shopName;
+    private String shopName;
 
     @ApiModelProperty("培训id")
     private Long employeeTrainingId;