cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 教培调整

dev-tmp1
zhanglei 2026-08-24 10:42:09 +08:00
parent b85d7284f8
commit beeb4320a0
10 changed files with 54 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CourseManagementDTO.java
View File

@ -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<CourseRelCoursewareDTO> courseRelCoursewareDTOList;
/**
* 来源(1:管理员添加,2:三方添加)
*/
@TableField(value = "source")
private Integer source;
}

7
safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/CoursewareManagementDTO.java
View File

@ -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;
}

7
safety-cedu-service/src/main/java/org/qinan/cedu/model/dto/QuestionUpdateDTO.java
View File

@ -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<QuestionOptionUpdateDTO> questionOptionList;
/**
* 来源(1:管理员添加,2:三方添加)
*/
@TableField(value = "source")
private Integer source;
}

6
safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CourseManagementDO.java
View File

@ -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;
}

5
safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/CoursewareManagementDO.java
View File

@ -79,4 +79,9 @@ public class CoursewareManagementDO extends BaseEntity {
*/
@TableField(value = "courseware_description")
private String coursewareDescription;
/**
* 来源(1:管理员添加,2:三方添加)
*/
private Integer source;
}

6
safety-cedu-service/src/main/java/org/qinan/cedu/model/entity/QuestionDO.java
View File

@ -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;
}

5
safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CourseManagementVO.java
View File

@ -65,4 +65,9 @@ public class CourseManagementVO extends BaseVO {
@ApiModelProperty("归属课件")
private List<CourseRelCoursewareVO> courseRelCoursewareVOList;
/**
* 来源(1:管理员添加,2:三方添加)
*/
private Integer source;
}

5
safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/CoursewareManagementVO.java
View File

@ -77,4 +77,9 @@ public class CoursewareManagementVO extends BaseVO {
@ApiModelProperty("习题ID")
private List<String> questionIds;
/**
* 来源(1:管理员添加,2:三方添加)
*/
private Integer source;
}

6
safety-cedu-service/src/main/java/org/qinan/cedu/model/vo/QuestionVO.java
View File

@ -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<QuestionOptionVO> questionOptionVOList;
/**
* 来源(1:管理员添加,2:三方添加)
*/
private Integer source;
}

9
safety-cedu-service/src/main/java/org/qinan/cedu/service/impl/ClassManagementServiceImpl.java
View File

@ -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<ClassManagementMappe
.eq(ClassManagementDO::getId, id)
.eq(ClassManagementDO::getDeleteEnum, DeleteEnum.FALSE.getCode())
.one();
return classManagementConvertor.convertEToVo(entity);
ClassManagementVO classManagementVO = classManagementConvertor.convertEToVo(entity);
List<ClassManagementVO> classManagementVOS = Collections.singletonList(classManagementVO);
fillStudentCount(classManagementVOS);
return classManagementVOS.get(0);
}
@Override