diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassCourseDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassCourseDTO.java index 79d5efcd..d27beec3 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassCourseDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/ClassCourseDTO.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * 班级课程 @@ -29,4 +30,7 @@ public class ClassCourseDTO { @ApiModelProperty("视频累计时长(小时)") private BigDecimal videoDuration; + + @ApiModelProperty("课件id集合") + private List coursewareId; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassCourseDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassCourseDO.java index 5a994c9f..126706b1 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassCourseDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/ClassCourseDO.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; +import java.util.List; /** * 班级课程 @@ -35,4 +37,7 @@ public class ClassCourseDO extends BaseEntity { @TableField("video_duration") private BigDecimal videoDuration; + + @TableField(value = "courseware_id", typeHandler = JacksonTypeHandler.class) + private List coursewareId; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassCourseVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassCourseVO.java index 7453cfc4..0b7164f5 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassCourseVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassCourseVO.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; +import java.util.List; /** * 班级课程 @@ -15,17 +16,20 @@ import java.math.BigDecimal; public class ClassCourseVO extends BaseVO { @ApiModelProperty("所属班级ID") - private Long classId; + private String classId; @ApiModelProperty("课程名称") private String courseName; @ApiModelProperty("课程id") - private Long courseId; + private String courseId; @ApiModelProperty("要求完成总学时(小时)") private BigDecimal requiredTotalHours; @ApiModelProperty("视频累计时长(小时)") private BigDecimal videoDuration; + + @ApiModelProperty("课件id集合") + private List coursewareId; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java index a204f236..1f497017 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassManagementVO.java @@ -92,5 +92,5 @@ public class ClassManagementVO extends BaseVO { * 试卷id */ @ApiModelProperty("试卷id") - private Long paperId; + private String paperId; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentExamRecordVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentExamRecordVO.java index a86d901d..71b19aa5 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentExamRecordVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentExamRecordVO.java @@ -18,19 +18,19 @@ import java.time.LocalDateTime; public class ClassStudentExamRecordVO extends BaseVO { @ApiModelProperty("学员ID") - private Long studentId; + private String studentId; @ApiModelProperty("学员名称") private String studentName; @ApiModelProperty("所属班级ID") - private Long classId; + private String classId; @ApiModelProperty("试卷名称") private String paperName; @ApiModelProperty("试卷id") - private Long paperId; + private String paperId; @ApiModelProperty("得分") private BigDecimal score; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentLearningRecordVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentLearningRecordVO.java index 4f2db241..d98118d7 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentLearningRecordVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentLearningRecordVO.java @@ -17,13 +17,13 @@ import java.time.LocalDateTime; public class ClassStudentLearningRecordVO extends BaseVO { @ApiModelProperty("学员ID") - private Long studentId; + private String studentId; @ApiModelProperty("所属班级ID") - private Long classId; + private String classId; @ApiModelProperty("课程ID") - private Long courseId; + private String courseId; @ApiModelProperty("课程名称") private String courseName; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentVO.java index 41d41535..e41ed636 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/ClassStudentVO.java @@ -18,7 +18,7 @@ import java.time.LocalDateTime; public class ClassStudentVO extends BaseVO { @ApiModelProperty("关联班级ID") - private Long classId; + private String classId; @ApiModelProperty("姓名") private String studentName; diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseRelCoursewareVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseRelCoursewareVO.java index 88594836..2017ef0a 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseRelCoursewareVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseRelCoursewareVO.java @@ -28,13 +28,13 @@ public class CourseRelCoursewareVO { * 课件id */ @ApiModelProperty("课件id") - private Long coursewareId; + private String coursewareId; /** * 课程id */ @ApiModelProperty("课程id") - private Long courseId; + private String courseId; /** * 排序 diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java index ac228f33..c2f24923 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java @@ -76,5 +76,5 @@ public class CoursewareManagementVO extends BaseVO { private String coursewareDescription; @ApiModelProperty("习题ID") - private List questionIds; + private List questionIds; } \ No newline at end of file diff --git a/safety-cedu-service/src/班级管理.sql b/safety-cedu-service/src/班级管理.sql index 1148dce7..d4dd25ff 100644 --- a/safety-cedu-service/src/班级管理.sql +++ b/safety-cedu-service/src/班级管理.sql @@ -5,6 +5,7 @@ create table class_course class_id bigint not null comment '所属班级ID(关联training_class.id)', course_name varchar(200) not null comment '课程名称', course_id bigint not null comment '课程id', + courseware_id text not null comment '课件id集合', required_total_hours decimal(10, 2) null comment '要求完成总学时(小时)', video_duration decimal(10, 2) null comment '视频累计时长(小时)', delete_enum varchar(32) null comment '删除标识true false',