From f618dee7340f6fd080818e33d806a942fdf6fc3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
<7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 8 Oct 2024 00:23:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../manage/domain/BusTrainingVideoUser.java | 78 ++++++++++++++++--
.../manage/BusTrainingVideoUserMapper.xml | 10 ++-
yanzhu-ui-vue3/src/assets/images/poster.gif | Bin 0 -> 5832 bytes
.../views/manage/busTrainingVideo/index.vue | 38 ++++++++-
.../manage/busTrainingVideoUser/index.vue | 57 ++++++++++++-
5 files changed, 169 insertions(+), 14 deletions(-)
create mode 100644 yanzhu-ui-vue3/src/assets/images/poster.gif
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 0000000000000000000000000000000000000000..0dccb01c3adb172d2d2a27e1d66969579f6b623c
GIT binary patch
literal 5832
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
literal 0
HcmV?d00001
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 @@
{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
+
+
+
+ 播放
+
+
+
+
+
+
+
+
\ No newline at end of file