|
@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
|
|
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
|
|
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
|
|
|
import com.qmth.teachcloud.common.base.BaseEntity;
|
|
|
+import com.qmth.teachcloud.obe.been.report.ReportCourseBasicInfoDto;
|
|
|
import com.qmth.teachcloud.obe.been.result.report.ReportResult;
|
|
|
import io.swagger.annotations.ApiModel;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.Objects;
|
|
|
|
|
|
|
|
|
* <p>
|
|
@@ -121,9 +121,10 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
|
|
|
}
|
|
|
|
|
|
public TRBasicInfo(Long cultureProgramId, Long courseId, String courseCode, String courseName,
|
|
|
- String paperNumber, String openTime, String teachingObject, String teacher, Integer participantCount,
|
|
|
- Long userId, String profession, String finishPoints, String requirementPoints,
|
|
|
- String courseSuggest, BigDecimal courseDegree, String courseEnName, Long examId, String college) {
|
|
|
+ String paperNumber, String openTime,
|
|
|
+ Long userId, String finishPoints, String requirementPoints,
|
|
|
+ String courseSuggest, String courseEnName, Long examId,
|
|
|
+ ReportCourseBasicInfoDto reportCourseBasicInfoDto) {
|
|
|
insertInfo(userId);
|
|
|
this.cultureProgramId = cultureProgramId;
|
|
|
this.courseId = courseId;
|
|
@@ -131,19 +132,17 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
|
|
|
this.courseName = courseName;
|
|
|
this.paperNumber = paperNumber;
|
|
|
this.openTime = openTime;
|
|
|
- this.teachingObject = teachingObject;
|
|
|
- this.teacher = teacher;
|
|
|
- this.participantCount = participantCount;
|
|
|
+ this.teachingObject = reportCourseBasicInfoDto.getTeachingObject();
|
|
|
this.enable = true;
|
|
|
this.reportResult = new ReportResult();
|
|
|
- this.profession = profession;
|
|
|
- this.courseDegree = courseDegree;
|
|
|
+ this.profession = reportCourseBasicInfoDto.getProfession();
|
|
|
+ this.courseDegree = reportCourseBasicInfoDto.getCourseDegree();
|
|
|
this.courseEnName = courseEnName;
|
|
|
this.finishPoints = finishPoints;
|
|
|
this.requirementPoints = requirementPoints;
|
|
|
this.courseSuggest = courseSuggest;
|
|
|
this.examId = examId;
|
|
|
- this.college = college;
|
|
|
+ this.college = reportCourseBasicInfoDto.getCollege();
|
|
|
}
|
|
|
|
|
|
public String getCourseEnName() {
|
|
@@ -200,8 +199,12 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
|
|
|
this.enable = true;
|
|
|
}
|
|
|
|
|
|
- public void updateInfo(TRBasicInfo trBasicInfo, Long userId) {
|
|
|
+ public void updateInfo(TRBasicInfo trBasicInfo, ReportCourseBasicInfoDto reportCourseBasicInfoDto, Long userId) {
|
|
|
this.setValue(trBasicInfo);
|
|
|
+ this.college = reportCourseBasicInfoDto.getCollege();
|
|
|
+ this.teachingObject = reportCourseBasicInfoDto.getTeachingObject();
|
|
|
+ this.courseDegree = reportCourseBasicInfoDto.getCourseDegree();
|
|
|
+ this.profession = reportCourseBasicInfoDto.getProfession();
|
|
|
updateInfo(userId);
|
|
|
}
|
|
|
|
|
@@ -249,25 +252,25 @@ public class TRBasicInfo extends BaseEntity implements Serializable {
|
|
|
}
|
|
|
|
|
|
public void setBasicInfo(Long examId, String courseCode, String courseName, String paperNumber, String openTime,
|
|
|
- String teachingObject, String teacher, Integer participantCount, Long cultureProgramId,
|
|
|
- Long courseId, BigDecimal courseDegree, String profession, String courseEnName, String college,
|
|
|
- String finishPoints, String requirementPoints, String courseSuggest) {
|
|
|
+ Long cultureProgramId,
|
|
|
+ Long courseId, String courseEnName,
|
|
|
+ String finishPoints, String requirementPoints, String courseSuggest,
|
|
|
+ ReportCourseBasicInfoDto reportCourseBasicInfoDto) {
|
|
|
this.examId = examId;
|
|
|
this.courseCode = courseCode;
|
|
|
this.courseName = courseName;
|
|
|
this.paperNumber = paperNumber;
|
|
|
this.openTime = openTime;
|
|
|
- this.teachingObject = teachingObject;
|
|
|
- this.teacher = teacher;
|
|
|
- this.participantCount = participantCount;
|
|
|
+ this.teachingObject = reportCourseBasicInfoDto.getTeachingObject();
|
|
|
+ this.teacher = reportCourseBasicInfoDto.getTeacher();
|
|
|
this.enable = true;
|
|
|
this.reportResult = new ReportResult();
|
|
|
this.cultureProgramId = cultureProgramId;
|
|
|
this.courseId = courseId;
|
|
|
- this.courseDegree = courseDegree;
|
|
|
- this.profession = profession;
|
|
|
+ this.courseDegree = reportCourseBasicInfoDto.getCourseDegree();
|
|
|
+ this.profession = reportCourseBasicInfoDto.getProfession();
|
|
|
this.courseEnName = courseEnName;
|
|
|
- this.college = college;
|
|
|
+ this.college = reportCourseBasicInfoDto.getCollege();
|
|
|
this.finishPoints = finishPoints;
|
|
|
this.requirementPoints = requirementPoints;
|
|
|
this.courseSuggest = courseSuggest;
|