From 79d1527adc210ed7f6eae2e3b74231003c5132b8 Mon Sep 17 00:00:00 2001 From: xuhubin <1269286451@qq.com> Date: Fri, 6 Nov 2020 12:29:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../front/domain/OnlineCoursesEvaluate.java | 13 +++++++++++++ .../front/OnlineCoursesEvaluateMapper.xml | 3 ++- .../templates/front/carousel/edit.html | 8 +++++--- .../resources/templates/front/cases/edit.html | 8 +++++--- .../templates/front/courses/edit.html | 18 +++++++++++------- .../templates/front/evaluate/evaluate.html | 4 ++++ .../templates/front/recruitment/edit.html | 8 +++++--- 7 files changed, 45 insertions(+), 17 deletions(-) diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java b/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java index 0218e60c0..a3e7abfda 100644 --- a/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java +++ b/ruoyi-front/src/main/java/com/ruoyi/front/domain/OnlineCoursesEvaluate.java @@ -23,6 +23,9 @@ public class OnlineCoursesEvaluate extends BaseEntity @Excel(name = "线上课程ID") private Long onlineCoursesId; + //线上课程标题 + private String onlineCoursesName; + /** 评价内容 */ @Excel(name = "评价内容") private String evaluateContent; @@ -51,6 +54,15 @@ public class OnlineCoursesEvaluate extends BaseEntity this.id = id; } + public String getOnlineCoursesName() + { + return onlineCoursesName; + } + public void setOnlineCoursesName(String onlineCoursesName) + { + this.onlineCoursesName = onlineCoursesName; + } + public Long getId() { return id; @@ -124,6 +136,7 @@ public class OnlineCoursesEvaluate extends BaseEntity return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getId()) .append("onlineCoursesId", getOnlineCoursesId()) + .append("onlineCoursesName", getOnlineCoursesName()) .append("evaluateContent", getEvaluateContent()) .append("anonymousFlag", getAnonymousFlag()) .append("delFlag", getDelFlag()) diff --git a/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml b/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml index bf7992e28..128c09cc9 100644 --- a/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml +++ b/ruoyi-front/src/main/resources/mapper/front/OnlineCoursesEvaluateMapper.xml @@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select ce.id, ce.online_courses_id, ce.evaluate_content, ce.anonymous_flag, ce.create_by, ce.create_time, ce.update_by, ce.update_time, ce.audit_status, su.login_name check_by, ce.remark,ce.check_time from online_courses_evaluate ce left join sys_user su on ce.check_by=su.user_id + select ce.id, ce.online_courses_id,oc.title online_courses_name, ce.evaluate_content, ce.anonymous_flag, ce.create_by, ce.create_time, ce.update_by, ce.update_time, ce.audit_status, su.user_name check_by, ce.remark,ce.check_time from online_courses_evaluate ce join online_courses oc on ce.online_courses_id=oc.id left join sys_user su on ce.check_by=su.user_id -->
- +
@@ -91,14 +91,18 @@ function submitHandler() { if ($.validate.form()) { - let result = uploadFile(false, "pictureUrl"); - if (result != web_status.SUCCESS) { - return; + if ($('#filePath')[0].files[0] != null) { + let result = uploadFile(false, "pictureUrl"); + if (result != web_status.SUCCESS) { + return; + } } - let result2 = uploadMoreFile(false, "videoUrl","videoFilePath"); - if (result2 != web_status.SUCCESS) { - return; + if ($('#videoFilePath')[0].files[0] != null) { + let result2 = uploadMoreFile(false, "videoUrl", "videoFilePath"); + if (result2 != web_status.SUCCESS) { + return; + } } $.operate.save(prefix + "/edit", $('#form-courses-edit').serialize()); } diff --git a/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html b/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html index 1ed35b5a0..7b123a725 100644 --- a/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html +++ b/ruoyi-front/src/main/resources/templates/front/evaluate/evaluate.html @@ -108,6 +108,10 @@ field: 'onlineCoursesId', title: '线上课程ID' }, + { + field: 'onlineCoursesName', + title: '线上课程标题' + }, { field: 'evaluateContent', title: '评价内容' diff --git a/ruoyi-front/src/main/resources/templates/front/recruitment/edit.html b/ruoyi-front/src/main/resources/templates/front/recruitment/edit.html index 17aa19f0f..192c11cd3 100644 --- a/ruoyi-front/src/main/resources/templates/front/recruitment/edit.html +++ b/ruoyi-front/src/main/resources/templates/front/recruitment/edit.html @@ -63,9 +63,11 @@ function submitHandler() { if ($.validate.form()) { - let result = uploadFile(false, "pictureUrl"); - if (result != web_status.SUCCESS) { - return; + if ($('#filePath')[0].files[0] != null) { + let result = uploadFile(false, "pictureUrl"); + if (result != web_status.SUCCESS) { + return; + } } $.operate.save(prefix + "/edit", $('#form-recruitment-edit').serialize()); }