diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideoUser.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideoUser.java index 1e8be729..7cc0d8a6 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideoUser.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/BusTrainingVideoUser.java @@ -19,7 +19,7 @@ public class BusTrainingVideoUser extends BaseEntity private Long id; /** 公司主键 */ - private Long deptId; + private Long comId; /** 公司名称 */ @Excel(name = "公司名称") @@ -60,6 +60,26 @@ public class BusTrainingVideoUser extends BaseEntity @Excel(name = "删除标识") private Long isDel; + /** 培训名称 */ + @Excel(name = "培训名称") + private String trainTitle; + + /** 培训类型 */ + @Excel(name = "培训类型") + private String trainType; + + /** 培训级别 */ + @Excel(name = "培训级别") + private String trainLevel; + + /** 培训文件地址 */ + @Excel(name = "培训文件地址") + private String trainFilePath; + + /** 培训文件主图 */ + @Excel(name = "培训文件主图") + private String trainFileImage; + public void setId(Long id) { this.id = id; @@ -69,16 +89,16 @@ public class BusTrainingVideoUser extends BaseEntity { return id; } - public void setDeptId(Long deptId) - { - this.deptId = deptId; + + public Long getComId() { + return comId; } - public Long getDeptId() - { - return deptId; + public void setComId(Long comId) { + this.comId = comId; } - public void setProjectId(Long projectId) + + public void setProjectId(Long projectId) { this.projectId = projectId; } @@ -165,11 +185,51 @@ public class BusTrainingVideoUser extends BaseEntity this.userName = userName; } + public String getTrainTitle() { + return trainTitle; + } + + public void setTrainTitle(String trainTitle) { + this.trainTitle = trainTitle; + } + + public String getTrainType() { + return trainType; + } + + public void setTrainType(String trainType) { + this.trainType = trainType; + } + + public String getTrainLevel() { + return trainLevel; + } + + public void setTrainLevel(String trainLevel) { + this.trainLevel = trainLevel; + } + + public String getTrainFilePath() { + return trainFilePath; + } + + public void setTrainFilePath(String trainFilePath) { + this.trainFilePath = trainFilePath; + } + + public String getTrainFileImage() { + return trainFileImage; + } + + public void setTrainFileImage(String trainFileImage) { + this.trainFileImage = trainFileImage; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) - .append("deptId", getDeptId()) + .append("comId", getComId()) .append("projectId", getProjectId()) .append("userId", getUserId()) .append("videoId", getVideoId()) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoUserMapper.xml index 837d630e..5e3de900 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoUserMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BusTrainingVideoUserMapper.xml @@ -14,6 +14,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -25,7 +30,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select btvu.id, btvu.com_id, sd.dept_name as com_name, btvu.project_id, pi.project_name, btvu.user_id, su.nick_name as user_nick, su.user_name, btvu.video_id, btvu.play_status, btvu.sort_by, btvu.is_del, btvu.create_by, btvu.create_time, btvu.update_by, btvu.update_time, btvu.remark from bus_training_video_user btvu + select btvu.id, btvu.com_id, sd.dept_name as com_name, btvu.project_id, pi.project_name, btvu.user_id, su.nick_name as user_nick, su.user_name, btvu.video_id, btv.train_title, + btv.train_type, btv.train_level, btv.train_file_path, btv.train_file_image, + btvu.play_status, btvu.sort_by, btvu.is_del, btvu.create_by, btvu.create_time, btvu.update_by, btvu.update_time, btvu.remark from bus_training_video_user btvu + left join bus_training_video btv on btv.id = btvu.video_id left join pro_project_info pi on pi.id = btvu.project_id left join sys_dept sd on sd.com_id = btvu.com_id left join sys_user su on su.user_id = btvu.user_id diff --git a/yanzhu-ui-vue3/src/assets/images/poster.gif b/yanzhu-ui-vue3/src/assets/images/poster.gif new file mode 100644 index 00000000..0dccb01c Binary files /dev/null and b/yanzhu-ui-vue3/src/assets/images/poster.gif differ diff --git a/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue b/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue index 84d507b6..e1876af2 100644 --- a/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/busTrainingVideo/index.vue @@ -117,7 +117,12 @@ - + + + + + + + + + \ No newline at end of file