From beeb4320a0627df1e91baf3db02194c691374273 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Mon, 24 Aug 2026 10:42:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=99=E5=9F=B9=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/qinan/cedu/model/dto/CourseManagementDTO.java | 7 +++++++ .../qinan/cedu/model/dto/CoursewareManagementDTO.java | 7 +++++++ .../java/org/qinan/cedu/model/dto/QuestionUpdateDTO.java | 7 +++++++ .../org/qinan/cedu/model/entity/CourseManagementDO.java | 6 +++++- .../qinan/cedu/model/entity/CoursewareManagementDO.java | 5 +++++ .../java/org/qinan/cedu/model/entity/QuestionDO.java | 6 ++++-- .../java/org/qinan/cedu/model/vo/CourseManagementVO.java | 5 +++++ .../org/qinan/cedu/model/vo/CoursewareManagementVO.java | 5 +++++ .../main/java/org/qinan/cedu/model/vo/QuestionVO.java | 6 ++++-- .../cedu/service/impl/ClassManagementServiceImpl.java | 9 +++++---- 10 files changed, 54 insertions(+), 9 deletions(-) diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementDTO.java index ee69f4e5..10127552 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementDTO.java @@ -1,5 +1,6 @@ package org.qinan.cedu.model.dto; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -68,4 +69,10 @@ public class CourseManagementDTO{ @ApiModelProperty("归属课件") private List courseRelCoursewareDTOList; + + /** + * 来源(1:管理员添加,2:三方添加) + */ + @TableField(value = "source") + private Integer source; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementDTO.java index 85325c73..d53e3f7b 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementDTO.java @@ -1,5 +1,6 @@ package org.qinan.cedu.model.dto; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -75,4 +76,10 @@ public class CoursewareManagementDTO{ */ @ApiModelProperty("课件描述") private String coursewareDescription; + + /** + * 来源(1:管理员添加,2:三方添加) + */ + @TableField(value = "source") + private Integer source; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/QuestionUpdateDTO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/QuestionUpdateDTO.java index 2e59cb20..e35c8c8e 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/QuestionUpdateDTO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/QuestionUpdateDTO.java @@ -1,5 +1,6 @@ package org.qinan.cedu.model.dto; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -46,4 +47,10 @@ public class QuestionUpdateDTO { @NotEmpty(message = "试题选项不能为空") @Valid private List questionOptionList; + + /** + * 来源(1:管理员添加,2:三方添加) + */ + @TableField(value = "source") + private Integer source; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java index e6e3a98c..7c9b691d 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java @@ -4,7 +4,6 @@ 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.jjb.saas.framework.repository.basedo.BaseDO; import lombok.Data; import lombok.EqualsAndHashCode; @@ -71,4 +70,9 @@ public class CourseManagementDO extends BaseEntity { */ @TableField(value = "used") private Integer used; + /** + * 来源(1:管理员添加,2:三方添加) + */ + private Integer source; + } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java index 08b27f05..1ee2ab7e 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java @@ -79,4 +79,9 @@ public class CoursewareManagementDO extends BaseEntity { */ @TableField(value = "courseware_description") private String coursewareDescription; + + /** + * 来源(1:管理员添加,2:三方添加) + */ + private Integer source; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/QuestionDO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/QuestionDO.java index 70ed5c74..a842fa6b 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/QuestionDO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/QuestionDO.java @@ -1,7 +1,6 @@ package org.qinan.cedu.model.entity; 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 io.swagger.annotations.ApiModel; @@ -10,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; -import java.util.List; /** * 试题 @@ -53,4 +51,8 @@ public class QuestionDO extends BaseEntity { @ApiModelProperty("关联课件管理id") private Long coursewareManagementId; + /** + * 来源(1:管理员添加,2:三方添加) + */ + private Integer source; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java index 09737f75..42e19e20 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java @@ -65,4 +65,9 @@ public class CourseManagementVO extends BaseVO { @ApiModelProperty("归属课件") private List courseRelCoursewareVOList; + + /** + * 来源(1:管理员添加,2:三方添加) + */ + private Integer source; } \ No newline at end of file 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 c2f24923..4bb560a6 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 @@ -77,4 +77,9 @@ public class CoursewareManagementVO extends BaseVO { @ApiModelProperty("习题ID") private List questionIds; + + /** + * 来源(1:管理员添加,2:三方添加) + */ + private Integer source; } \ No newline at end of file diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java index 17713449..3cbc9876 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java @@ -6,8 +6,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; -import org.qinan.cedu.model.entity.QuestionOptionDO; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; @@ -62,4 +60,8 @@ public class QuestionVO { @ApiModelProperty("试题选项信息") private List questionOptionVOList; + /** + * 来源(1:管理员添加,2:三方添加) + */ + private Integer source; } diff --git a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java index 7926e20a..648cee30 100644 --- a/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java +++ b/safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java @@ -23,9 +23,7 @@ import org.springframework.util.StringUtils; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -89,7 +87,10 @@ public class ClassManagementServiceImpl extends ServiceImpl classManagementVOS = Collections.singletonList(classManagementVO); + fillStudentCount(classManagementVOS); + return classManagementVOS.get(0); } @Override