diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareDTO.java index 60014e74..0f47227e 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareDTO.java @@ -52,4 +52,10 @@ public class CourseRelCoursewareDTO { */ @ApiModelProperty("课时时长(小时)") private BigDecimal classHourDuration; + + /** + * 学时 + */ + @ApiModelProperty("学时") + private BigDecimal creditHours; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareVO.java index c32933ad..293820bf 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseRelCoursewareVO.java @@ -47,4 +47,10 @@ public class CourseRelCoursewareVO { */ @ApiModelProperty("课时时长(小时)") private BigDecimal classHourDuration; + + /** + * 学时 + */ + @ApiModelProperty("学时") + private BigDecimal creditHours; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCoursewareDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCoursewareDO.java index 4d6159cd..22fb6327 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCoursewareDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseRelCoursewareDO.java @@ -55,4 +55,10 @@ public class CourseRelCoursewareDO { */ @TableField(value = "class_hour_duration") private BigDecimal classHourDuration; + + /** + * 学时 + */ + @TableField(value = "credit_hours") + private BigDecimal creditHours; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java index e9b5fac3..aa7e0487 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/CourseManagementServiceImpl.java @@ -88,7 +88,7 @@ public class CourseManagementServiceImpl extends ServiceImpl courseRelCoursewareDOS = courseRelCoursewareConvertor.convertDtoListToEList(dto.getCourseRelCoursewareDTOList()); if (entity.getClassHourDuration() == null) { - entity.setClassHourDuration(courseRelCoursewareDOS.stream().map(CourseRelCoursewareDO::getClassHourDuration).filter(Objects::nonNull) + entity.setClassHourDuration(courseRelCoursewareDOS.stream().map(CourseRelCoursewareDO::getCreditHours).filter(Objects::nonNull) .reduce(BigDecimal.ZERO, BigDecimal::add)); } this.save(entity); @@ -108,7 +108,7 @@ public class CourseManagementServiceImpl extends ServiceImpl courseRelCoursewareDOS = courseRelCoursewareConvertor.convertDtoListToEList(dto.getCourseRelCoursewareDTOList()); if (entity.getClassHourDuration() == null) { - entity.setClassHourDuration(courseRelCoursewareDOS.stream().map(CourseRelCoursewareDO::getClassHourDuration).filter(Objects::nonNull) + entity.setClassHourDuration(courseRelCoursewareDOS.stream().map(CourseRelCoursewareDO::getCreditHours).filter(Objects::nonNull) .reduce(BigDecimal.ZERO, BigDecimal::add)); } this.updateById(entity); diff --git a/safety-cedu-service/src/test/java/db.sql b/safety-cedu-service/src/test/java/db.sql index 84891eb8..4507e275 100644 --- a/safety-cedu-service/src/test/java/db.sql +++ b/safety-cedu-service/src/test/java/db.sql @@ -157,17 +157,20 @@ create table course_management create table course_rel_courseware ( - id bigint not null comment '主键' + id bigint not null comment '主键' primary key, - courseware_name varchar(200) null comment '课件名称', - courseware_document varchar(512) null comment '课件文档(文件名或路径)', - courseware_id bigint null comment '课件id', - course_id bigint null comment '课程id', - sort int null comment '排序', - class_hour_duration_unit varchar(10) default '小时' null comment '课时时长单位' + courseware_name varchar(200) null comment '课件名称', + courseware_document varchar(512) null comment '课件文档(文件名或路径)', + courseware_id bigint null comment '课件id', + course_id bigint null comment '课程id', + sort int null comment '排序', + class_hour_duration_unit varchar(10) default '小时' null comment '课时时长单位', + credit_hours decimal(5, 1) unsigned default 0.0 null comment '学时' ) comment '课程关联课件表'; + + create table courseware_management ( delete_enum varchar(32) charset utf8mb4 null comment '删除标识true false',