diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java index 874701c2..9cd4223b 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourse.java @@ -15,7 +15,7 @@ import org.beetl.sql.fetch.annotation.FetchSql; import javax.validation.constraints.NotNull; import java.util.Date; -/* +/* * 教师-我的课程-开课 * gen by Spring Boot2 Admin 2022-09-08 */ @@ -28,15 +28,15 @@ public class TeacherOpenCourse extends BaseEntity{ @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourse") private Long teacherOpenCourseId ; - + //开课名称 private String teacherOpenCourseTitle ; - + //课程编码 private String teacherOpenCourseCode ; - + //封面列表(JSON格式: {封面URL:is默认封面}) // 也可以是 逗号隔开的图片列表,第一个是默认封面。只需要控制图片保存时候的位置。 private String teacherOpenCourseCover ; @@ -44,7 +44,7 @@ public class TeacherOpenCourse extends BaseEntity{ // 简介 private String teacherOpenCourseSummary; - + //开课状态(1启用 2禁用) @Dict(type="global_open_status") @@ -79,6 +79,13 @@ public class TeacherOpenCourse extends BaseEntity{ @InsertIgnore private Integer courseInfoCount; + @FetchSql("select sum(IFNULL(t.teacher_open_course_schedule_session_tag_duration, 0)) as course_hours " + + "from teacher_open_course_schedule_session_snap t " + + "where t.teacher_open_course_id = #teacherOpenCourseId# ") + @UpdateIgnore + @InsertIgnore + private float courseHours; + @Setter @Getter @Accessors(chain = true) @@ -99,28 +106,28 @@ public class TeacherOpenCourse extends BaseEntity{ //开课时间 private Date startTime ; - + //结课时间 private Date endTime ; - + //组织ID private Long orgId ; - + //用户ID private Long userId ; - + //创建时间 private Date createTime ; - + public TeacherOpenCourse(){ } /**课程开课ID - *@return + *@return */ public Long getTeacherOpenCourseId(){ return teacherOpenCourseId; @@ -133,7 +140,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**开课名称 - *@return + *@return */ public String getTeacherOpenCourseTitle(){ return teacherOpenCourseTitle; @@ -146,7 +153,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**课程编码 - *@return + *@return */ public String getTeacherOpenCourseCode(){ return teacherOpenCourseCode; @@ -159,7 +166,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**封面列表(JSON格式: {封面URL:is默认封面}) - *@return + *@return */ public String getTeacherOpenCourseCover(){ return teacherOpenCourseCover; @@ -172,7 +179,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**开课状态(1启用 2禁用) - *@return + *@return */ public Integer getTeacherOpenCourseStatus(){ return teacherOpenCourseStatus; @@ -185,7 +192,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**开课时间 - *@return + *@return */ public Date getStartTime(){ return startTime; @@ -198,7 +205,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**结课时间 - *@return + *@return */ public Date getEndTime(){ return endTime; @@ -211,7 +218,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**组织ID - *@return + *@return */ public Long getOrgId(){ return orgId; @@ -224,7 +231,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**用户ID - *@return + *@return */ public Long getUserId(){ return userId; @@ -237,7 +244,7 @@ public class TeacherOpenCourse extends BaseEntity{ } /**创建时间 - *@return + *@return */ public Date getCreateTime(){ return createTime; @@ -280,4 +287,12 @@ public class TeacherOpenCourse extends BaseEntity{ public void setCourseInfoCount(Integer courseInfoCount) { this.courseInfoCount = courseInfoCount; } + + public float getCourseHours() { + return courseHours; + } + + public void setCourseHours(float courseHours) { + this.courseHours = courseHours; + } } diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js index 5f16b366..a3eda7b7 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourse/index.js @@ -59,15 +59,16 @@ layui.define(['form', 'laydate', 'table'], function (exports) { align: "center", }, { - field: 'time', + field: 'courseHours', title: '课程学时', align: "center", hideField: false, - hide: $.isEmpty(sx_['endTime']) ? false : sx_['endTime'], + hide: $.isEmpty(sx_['courseHours']) ? false : sx_['courseHours'], templet: function (d) { - var v = Common.GetDateDiff(d.startTime, d.endTime, 'hour'); - // TODO 这里后面要改 - return v / 10 + "学时"; + // var v = Common.GetDateDiff(d.startTime, d.endTime, 'hour'); + // // TODO 这里后面要改 + // return v / 10 + "学时"; + return d.courseHours + "学时"; } }, {