diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOn.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOn.java index 8b573a4e..735f405c 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOn.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOn.java @@ -1,21 +1,23 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - +import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.annotation.entity.*; - import com.ibeetl.admin.core.util.ValidateConfig; +import com.ibeetl.jlw.enums.CopyFromEnum; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.beetl.sql.annotation.entity.AssignID; -import com.ibeetl.admin.core.annotation.Dict; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* * 教师开课-课程实操 * gen by Spring Boot2 Admin 2022-10-25 */ + +@Data +@EqualsAndHashCode(callSuper = true) public class TeacherOpenCourseHandsOn extends BaseEntity{ //实操主键 @@ -60,139 +62,11 @@ public class TeacherOpenCourseHandsOn extends BaseEntity{ //数据集（多个地址，逗号隔开） private String trainingData ; - - public TeacherOpenCourseHandsOn(){ - } - - /**实操主键 - *@return - */ - public Long getHandsOnId(){ - return handsOnId; - } - /**实操主键 - *@param handsOnId - */ - public void setHandsOnId(Long handsOnId){ - this.handsOnId = handsOnId; - } - - /**开课ID - *@return - */ - public Long getTeacherOpenCourseId(){ - return teacherOpenCourseId; - } - /**开课ID - *@param teacherOpenCourseId - */ - public void setTeacherOpenCourseId(Long teacherOpenCourseId){ - this.teacherOpenCourseId = teacherOpenCourseId; - } - - /**归属课程 - *@return - */ - public Long getCourseInfoId(){ - return courseInfoId; - } - /**归属课程 - *@param courseInfoId - */ - public void setCourseInfoId(Long courseInfoId){ - this.courseInfoId = courseInfoId; - } - - /**归属章节 - *@return - */ - public String getCourseChildNode(){ - return courseChildNode; - } - /**归属章节 - *@param courseChildNode - */ - public void setCourseChildNode(String courseChildNode){ - this.courseChildNode = courseChildNode; - } - - /**实操名称 - *@return - */ - public String getHandsOnName(){ - return handsOnName; - } - /**实操名称 - *@param handsOnName - */ - public void setHandsOnName(String handsOnName){ - this.handsOnName = handsOnName; - } - - /**实操介绍 - *@return - */ - public String getHandsOnRecommend(){ - return handsOnRecommend; - } - /**实操介绍 - *@param handsOnRecommend - */ - public void setHandsOnRecommend(String handsOnRecommend){ - this.handsOnRecommend = handsOnRecommend; - } - - /**添加时间 - *@return - */ - public Date getAddTime(){ - return addTime; - } - /**添加时间 - *@param addTime - */ - public void setAddTime(Date addTime){ - this.addTime = addTime; - } - - /**组织机构ID - *@return - */ - public Long getOrgId(){ - return orgId; - } - /**组织机构ID - *@param orgId - */ - public void setOrgId(Long orgId){ - this.orgId = orgId; - } - - /**后台用户ID - *@return - */ - public Long getUserId(){ - return userId; - } - /**后台用户ID - *@param userId - */ - public void setUserId(Long userId){ - this.userId = userId; - } - - /**数据集（多个地址，逗号隔开） - *@return - */ - public String getTrainingData(){ - return trainingData; - } - /**数据集（多个地址，逗号隔开） - *@param trainingData - */ - public void setTrainingData(String trainingData){ - this.trainingData = trainingData; - } + @DictEnum + private CopyFromEnum fromType; + + //来源Id + private Long sourceFromId; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java index f8ca7b6a..6bfb4d56 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java @@ -1,8 +1,12 @@ package com.ibeetl.jlw.entity; +import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO; +import com.ibeetl.jlw.enums.CopyFromEnum; +import lombok.Data; +import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; @@ -10,388 +14,112 @@ import java.math.BigDecimal; import java.util.Date; import java.util.List; -/* -* 教师开课-课程实操-实训任务 -* gen by Spring Boot2 Admin 2022-10-25 -*/ -public class TeacherOpenCourseHandsOnSimulationTasks extends BaseEntity{ +/* + * 教师开课-课程实操-实训任务 + * gen by Spring Boot2 Admin 2022-10-25 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class TeacherOpenCourseHandsOnSimulationTasks extends BaseEntity { //实训任务id - @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) // @SeqID(name = ORACLE_CORE_SEQ_NAME) - @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks") + @AssignID(value = "maskAutoID", param = "com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks") + + private Long taskId; - private Long taskId ; - //实操id(关联主表) - private Long handsOnId ; - + private Long handsOnId; + //开课ID - private Long teacherOpenCourseId ; - + private Long teacherOpenCourseId; + //任务类型 - private String taskType ; - + private String taskType; + //任务标题 - private String taskTitle ; - + private String taskTitle; + //任务分值 - private String taskScore ; - + private String taskScore; + //任务顺序 - private String taskOrder ; - + private String taskOrder; + //任务状态 - private String taskStatus ; - + private String taskStatus; + //考核要求(A,B, - private String assessmentRequirements ; - + private String assessmentRequirements; + //验证码弹出时间 - private String assessmentTime ; - + private String assessmentTime; + //考核内容 - private String assessmentContent ; - + private String assessmentContent; + //附件地址 - private String fileUrl ; - + private String fileUrl; + //题目id - private String taskList ; - + private String taskList; + //组织机构ID - private Long orgId ; - + private Long orgId; + //后台用户ID - private Long userId ; - + private Long userId; + //添加时间 - private Date addTime ; + private Date addTime; /** * 附件列表 */ private String teacherOpenCourseHandsOnSimulationTasksFile; + private List teacherOpenCourseHandsOnSimulationTasksFileList; /** * 实操题目列表 */ private String teacherOpenCourseHandsOnSimulationTasksAssessment; + private List teacherOpenCourseHandsOnSimulationTasksAssessmentList; private List handsOnTaskProblemVo; - public List getHandsOnTaskProblemVo() { - return handsOnTaskProblemVo; - } - - public void setHandsOnTaskProblemVo(List handsOnTaskProblemVo) { - this.handsOnTaskProblemVo = handsOnTaskProblemVo; - } - - public TeacherOpenCourseHandsOnSimulationTasks(){ - } - - private BigDecimal singleScore; + private BigDecimal multipleScore; + private BigDecimal judgeScore; + private BigDecimal fillScore; + private BigDecimal analysisScore; - public BigDecimal getSingleScore() { - return singleScore; - } - - public void setSingleScore(BigDecimal singleScore) { - this.singleScore = singleScore; - } - - public BigDecimal getMultipleScore() { - return multipleScore; - } - - public void setMultipleScore(BigDecimal multipleScore) { - this.multipleScore = multipleScore; - } - - public BigDecimal getJudgeScore() { - return judgeScore; - } - - public void setJudgeScore(BigDecimal judgeScore) { - this.judgeScore = judgeScore; - } - - public BigDecimal getFillScore() { - return fillScore; - } - - public void setFillScore(BigDecimal fillScore) { - this.fillScore = fillScore; - } - - public BigDecimal getAnalysisScore() { - return analysisScore; - } - - public void setAnalysisScore(BigDecimal analysisScore) { - this.analysisScore = analysisScore; - } - - /**实训任务id - *@return - */ - public Long getTaskId(){ - return taskId; - } - /**实训任务id - *@param taskId - */ - public void setTaskId(Long taskId){ - this.taskId = taskId; - } - - /**实操id(关联主表) - *@return - */ - public Long getHandsOnId(){ - return handsOnId; - } - /**实操id(关联主表) - *@param handsOnId - */ - public void setHandsOnId(Long handsOnId){ - this.handsOnId = handsOnId; - } - - /**开课ID - *@return - */ - public Long getTeacherOpenCourseId(){ - return teacherOpenCourseId; - } - /**开课ID - *@param teacherOpenCourseId - */ - public void setTeacherOpenCourseId(Long teacherOpenCourseId){ - this.teacherOpenCourseId = teacherOpenCourseId; - } - - /**任务类型 - *@return - */ - public String getTaskType(){ - return taskType; - } - /**任务类型 - *@param taskType - */ - public void setTaskType(String taskType){ - this.taskType = taskType; - } - - /**任务标题 - *@return - */ - public String getTaskTitle(){ - return taskTitle; - } - /**任务标题 - *@param taskTitle - */ - public void setTaskTitle(String taskTitle){ - this.taskTitle = taskTitle; - } - - /**任务分值 - *@return - */ - public String getTaskScore(){ - return taskScore; - } - /**任务分值 - *@param taskScore - */ - public void setTaskScore(String taskScore){ - this.taskScore = taskScore; - } - - /**任务顺序 - *@return - */ - public String getTaskOrder(){ - return taskOrder; - } - /**任务顺序 - *@param taskOrder - */ - public void setTaskOrder(String taskOrder){ - this.taskOrder = taskOrder; - } - - /**任务状态 - *@return - */ - public String getTaskStatus(){ - return taskStatus; - } - /**任务状态 - *@param taskStatus - */ - public void setTaskStatus(String taskStatus){ - this.taskStatus = taskStatus; - } - - /**考核要求(A,B, - *@return - */ - public String getAssessmentRequirements(){ - return assessmentRequirements; - } - /**考核要求(A,B, - *@param assessmentRequirements - */ - public void setAssessmentRequirements(String assessmentRequirements){ - this.assessmentRequirements = assessmentRequirements; - } - - /**考核时间分钟(考核要求AC必填) - *@return - */ - public String getAssessmentTime(){ - return assessmentTime; - } - /**考核时间分钟(考核要求AC必填) - *@param assessmentTime - */ - public void setAssessmentTime(String assessmentTime){ - this.assessmentTime = assessmentTime; - } - - /**考核内容 - *@return - */ - public String getAssessmentContent(){ - return assessmentContent; - } - /**考核内容 - *@param assessmentContent - */ - public void setAssessmentContent(String assessmentContent){ - this.assessmentContent = assessmentContent; - } - - /**附件地址 - *@return - */ - public String getFileUrl(){ - return fileUrl; - } - /**附件地址 - *@param fileUrl - */ - public void setFileUrl(String fileUrl){ - this.fileUrl = fileUrl; - } - - /**题目id - *@return - */ - public String getTaskList(){ - return taskList; - } - /**题目id - *@param taskList - */ - public void setTaskList(String taskList){ - this.taskList = taskList; - } - - /**组织机构ID - *@return - */ - public Long getOrgId(){ - return orgId; - } - /**组织机构ID - *@param orgId - */ - public void setOrgId(Long orgId){ - this.orgId = orgId; - } - - /**后台用户ID - *@return - */ - public Long getUserId(){ - return userId; - } - /**后台用户ID - *@param userId - */ - public void setUserId(Long userId){ - this.userId = userId; - } - - /**添加时间 - *@return - */ - public Date getAddTime(){ - return addTime; - } - /**添加时间 - *@param addTime - */ - public void setAddTime(Date addTime){ - this.addTime = addTime; - } - - public String getTeacherOpenCourseHandsOnSimulationTasksFile() { - return teacherOpenCourseHandsOnSimulationTasksFile; - } - - public void setTeacherOpenCourseHandsOnSimulationTasksFile(String teacherOpenCourseHandsOnSimulationTasksFile) { - this.teacherOpenCourseHandsOnSimulationTasksFile = teacherOpenCourseHandsOnSimulationTasksFile; - } - - public List getTeacherOpenCourseHandsOnSimulationTasksFileList() { - return teacherOpenCourseHandsOnSimulationTasksFileList; - } - - public void setTeacherOpenCourseHandsOnSimulationTasksFileList(List teacherOpenCourseHandsOnSimulationTasksFileList) { - this.teacherOpenCourseHandsOnSimulationTasksFileList = teacherOpenCourseHandsOnSimulationTasksFileList; - } - - public String getTeacherOpenCourseHandsOnSimulationTasksAssessment() { - return teacherOpenCourseHandsOnSimulationTasksAssessment; - } - - public void setTeacherOpenCourseHandsOnSimulationTasksAssessment(String teacherOpenCourseHandsOnSimulationTasksAssessment) { - this.teacherOpenCourseHandsOnSimulationTasksAssessment = teacherOpenCourseHandsOnSimulationTasksAssessment; - } - - public List getTeacherOpenCourseHandsOnSimulationTasksAssessmentList() { - return teacherOpenCourseHandsOnSimulationTasksAssessmentList; - } - - public void setTeacherOpenCourseHandsOnSimulationTasksAssessmentList(List teacherOpenCourseHandsOnSimulationTasksAssessmentList) { - this.teacherOpenCourseHandsOnSimulationTasksAssessmentList = teacherOpenCourseHandsOnSimulationTasksAssessmentList; - } + @DictEnum + private CopyFromEnum fromType; + + //来源Id + private Long sourceFromId; + } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksAssessment.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksAssessment.java index d3482f41..c3d6ce29 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksAssessment.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksAssessment.java @@ -1,14 +1,14 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - +import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.annotation.entity.*; - import com.ibeetl.admin.core.util.ValidateConfig; +import com.ibeetl.jlw.enums.CopyFromEnum; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.beetl.sql.annotation.entity.AssignID; -import com.ibeetl.admin.core.annotation.Dict; - +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.util.Date; @@ -16,6 +16,9 @@ import java.util.Date; * 教师开课-课程实操-实训任务考核题目表 * gen by Spring Boot2 Admin 2022-11-14 */ + +@Data +@EqualsAndHashCode(callSuper = true) public class TeacherOpenCourseHandsOnSimulationTasksAssessment extends BaseEntity{ //考核题目id @@ -56,126 +59,11 @@ public class TeacherOpenCourseHandsOnSimulationTasksAssessment extends BaseEntit //创建时间 private Date addTime ; - - public TeacherOpenCourseHandsOnSimulationTasksAssessment(){ - } - - /**考核题目id - *@return - */ - public Long getHandsOnSimulationTasksAssessmentId(){ - return handsOnSimulationTasksAssessmentId; - } - /**考核题目id - *@param handsOnSimulationTasksAssessmentId - */ - public void setHandsOnSimulationTasksAssessmentId(Long handsOnSimulationTasksAssessmentId){ - this.handsOnSimulationTasksAssessmentId = handsOnSimulationTasksAssessmentId; - } - - /**实操id - *@return - */ - public Long getHandsOnId(){ - return handsOnId; - } - /**实操id - *@param handsOnId - */ - public void setHandsOnId(Long handsOnId){ - this.handsOnId = handsOnId; - } - - /**实操任务id - *@return - */ - public Long getHandsOnTaskId(){ - return handsOnTaskId; - } - /**实操任务id - *@param handsOnTaskId - */ - public void setHandsOnTaskId(Long handsOnTaskId){ - this.handsOnTaskId = handsOnTaskId; - } - - /**考核题目 - *@return - */ - public String getHandsOnSimulationTasksAssessmentQuestion(){ - return handsOnSimulationTasksAssessmentQuestion; - } - /**考核题目 - *@param handsOnSimulationTasksAssessmentQuestion - */ - public void setHandsOnSimulationTasksAssessmentQuestion(String handsOnSimulationTasksAssessmentQuestion){ - this.handsOnSimulationTasksAssessmentQuestion = handsOnSimulationTasksAssessmentQuestion; - } - - /**考核答案 - *@return - */ - public String getHandsOnSimulationTasksAssessmentAnswer(){ - return handsOnSimulationTasksAssessmentAnswer; - } - /**考核答案 - *@param handsOnSimulationTasksAssessmentAnswer - */ - public void setHandsOnSimulationTasksAssessmentAnswer(String handsOnSimulationTasksAssessmentAnswer){ - this.handsOnSimulationTasksAssessmentAnswer = handsOnSimulationTasksAssessmentAnswer; - } - - /**考核分值 - *@return - */ - public BigDecimal getHandsOnSimulationTasksAssessmentScore(){ - return handsOnSimulationTasksAssessmentScore; - } - /**考核分值 - *@param handsOnSimulationTasksAssessmentScore - */ - public void setHandsOnSimulationTasksAssessmentScore(BigDecimal handsOnSimulationTasksAssessmentScore){ - this.handsOnSimulationTasksAssessmentScore = handsOnSimulationTasksAssessmentScore; - } - - /**组织机构ID - *@return - */ - public Long getOrgId(){ - return orgId; - } - /**组织机构ID - *@param orgId - */ - public void setOrgId(Long orgId){ - this.orgId = orgId; - } - - /**后台用户ID - *@return - */ - public Long getUserId(){ - return userId; - } - /**后台用户ID - *@param userId - */ - public void setUserId(Long userId){ - this.userId = userId; - } - - /**创建时间 - *@return - */ - public Date getAddTime(){ - return addTime; - } - /**创建时间 - *@param addTime - */ - public void setAddTime(Date addTime){ - this.addTime = addTime; - } + @DictEnum + private CopyFromEnum fromType; + + //来源Id + private Long sourceFromId; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksFile.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksFile.java index 72353566..6ce79c70 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksFile.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasksFile.java @@ -1,21 +1,23 @@ package com.ibeetl.jlw.entity; -import javax.validation.constraints.NotNull; - +import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; -import org.beetl.sql.annotation.entity.*; - import com.ibeetl.admin.core.util.ValidateConfig; +import com.ibeetl.jlw.enums.CopyFromEnum; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.beetl.sql.annotation.entity.AssignID; -import com.ibeetl.admin.core.annotation.Dict; - -import java.math.BigDecimal; +import javax.validation.constraints.NotNull; import java.util.Date; /* * 教师开课-课程实操-实训任务附件表 * gen by Spring Boot2 Admin 2022-10-25 */ + +@Data +@EqualsAndHashCode(callSuper = true) public class TeacherOpenCourseHandsOnSimulationTasksFile extends BaseEntity{ //实操任务文件ID @@ -64,152 +66,11 @@ public class TeacherOpenCourseHandsOnSimulationTasksFile extends BaseEntity{ //部门ID private Long orgId ; - - public TeacherOpenCourseHandsOnSimulationTasksFile(){ - } - - /**实操任务文件ID - *@return - */ - public Long getTaskFileId(){ - return taskFileId; - } - /**实操任务文件ID - *@param taskFileId - */ - public void setTaskFileId(Long taskFileId){ - this.taskFileId = taskFileId; - } - - /**开课ID - *@return - */ - public Long getTeacherOpenCourseId(){ - return teacherOpenCourseId; - } - /**开课ID - *@param teacherOpenCourseId - */ - public void setTeacherOpenCourseId(Long teacherOpenCourseId){ - this.teacherOpenCourseId = teacherOpenCourseId; - } - - /**实操ID - *@return - */ - public Long getHandsOnId(){ - return handsOnId; - } - /**实操ID - *@param handsOnId - */ - public void setHandsOnId(Long handsOnId){ - this.handsOnId = handsOnId; - } - - /**任务ID - *@return - */ - public Long getTaskId(){ - return taskId; - } - /**任务ID - *@param taskId - */ - public void setTaskId(Long taskId){ - this.taskId = taskId; - } - - /**文件地址 - *@return - */ - public String getFileUrl(){ - return fileUrl; - } - /**文件地址 - *@param fileUrl - */ - public void setFileUrl(String fileUrl){ - this.fileUrl = fileUrl; - } - - /**文件类型 - *@return - */ - public String getFileType(){ - return fileType; - } - /**文件类型 - *@param fileType - */ - public void setFileType(String fileType){ - this.fileType = fileType; - } - - /**视频时长 - *@return - */ - public String getFileTime(){ - return fileTime; - } - /**视频时长 - *@param fileTime - */ - public void setFileTime(String fileTime){ - this.fileTime = fileTime; - } - - /**文件名称 - *@return - */ - public String getFileName(){ - return fileName; - } - /**文件名称 - *@param fileName - */ - public void setFileName(String fileName){ - this.fileName = fileName; - } - - /**添加时间 - *@return - */ - public Date getAddTime(){ - return addTime; - } - /**添加时间 - *@param addTime - */ - public void setAddTime(Date addTime){ - this.addTime = addTime; - } - - /**用户ID - *@return - */ - public Long getUserId(){ - return userId; - } - /**用户ID - *@param userId - */ - public void setUserId(Long userId){ - this.userId = userId; - } - - /**部门ID - *@return - */ - public Long getOrgId(){ - return orgId; - } - /**部门ID - *@param orgId - */ - public void setOrgId(Long orgId){ - this.orgId = orgId; - } + @DictEnum + private CopyFromEnum fromType; + + //来源Id + private Long sourceFromId; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java index 59a4ec8b..68f3aad9 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeCourseInfo.java @@ -1,8 +1,10 @@ package com.ibeetl.jlw.entity; import com.ibeetl.admin.core.annotation.Dict; +import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; +import com.ibeetl.jlw.enums.CopyFromEnum; import lombok.EqualsAndHashCode; import org.beetl.sql.annotation.entity.AutoID; import org.beetl.sql.annotation.entity.InsertIgnore; @@ -33,8 +35,6 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp private Long teacherOpenCourseId ; - // 系统课程ID - private Long systemCourseInfoId ; // @UpdateIgnore // @InsertIgnore @@ -122,6 +122,13 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp //新增时间 @InsertIgnore private Date addTime; + + //类型 枚举（CopyFromEnum） + @DictEnum + private CopyFromEnum fromType; + + //来源Id + private Long sourceFromId; public TeacherOpenCourseMergeCourseInfo(){ } @@ -388,12 +395,19 @@ public class TeacherOpenCourseMergeCourseInfo extends BaseEntity implements Comp public int compareTo(TeacherOpenCourseMergeCourseInfo o) { return this.getTeacherOpenCourseMergeCourseInfoId().compareTo(o.getTeacherOpenCourseMergeCourseInfoId()); } + public CopyFromEnum getFromType() { + return fromType; + } + + public void setFromType(CopyFromEnum fromType) { + this.fromType = fromType; + } - public Long getSystemCourseInfoId() { - return systemCourseInfoId; + public Long getSourceFromId() { + return sourceFromId; } - public void setSystemCourseInfoId(Long systemCourseInfoId) { - this.systemCourseInfoId = systemCourseInfoId; + public void setSourceFromId(Long sourceFromId) { + this.sourceFromId = sourceFromId; } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java index 3fce1d8e..c6598c8e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesInfo.java @@ -4,6 +4,7 @@ import com.ibeetl.admin.core.annotation.Dict; import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; +import com.ibeetl.jlw.enums.CopyFromEnum; import com.ibeetl.jlw.enums.GlobalUpStatusEnum; import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.annotation.entity.InsertIgnore; @@ -73,6 +74,13 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{ */ @InsertIgnore private Date addTime; + + //类型 枚举（CopyFromEnum） + @DictEnum + private CopyFromEnum fromType; + + //来源Id + private Long sourceFromId; public TeacherOpenCourseMergeResourcesInfo(){ } @@ -208,4 +216,20 @@ public class TeacherOpenCourseMergeResourcesInfo extends BaseEntity{ public void setAddTime(Date addTime) { this.addTime = addTime; } + + public CopyFromEnum getFromType() { + return fromType; + } + + public void setFromType(CopyFromEnum fromType) { + this.fromType = fromType; + } + + public Long getSourceFromId() { + return sourceFromId; + } + + public void setSourceFromId(Long sourceFromId) { + this.sourceFromId = sourceFromId; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java index 2e2cc9b4..b2073532 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseMergeResourcesQuestion.java @@ -6,8 +6,10 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.ibeetl.admin.core.annotation.Dict; +import com.ibeetl.admin.core.annotation.DictEnum; import com.ibeetl.admin.core.entity.BaseEntity; import com.ibeetl.admin.core.util.ValidateConfig; +import com.ibeetl.jlw.enums.CopyFromEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -123,6 +125,15 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity { private Long orgId ; + + //类型 枚举（CopyFromEnum） + @DictEnum + private CopyFromEnum fromType; + + //来源Id + private Long sourceFromId; + + public TeacherOpenCourseMergeResourcesQuestion(){ } @@ -346,4 +357,21 @@ public class TeacherOpenCourseMergeResourcesQuestion extends BaseEntity { * 选项的属性 */ private final static Field[] optionFields = ReflectUtil.getFields(ResourcesQuestion.class, f -> f.getName().startsWith("questionOption")); + + + public CopyFromEnum getFromType() { + return fromType; + } + + public void setFromType(CopyFromEnum fromType) { + this.fromType = fromType; + } + + public Long getSourceFromId() { + return sourceFromId; + } + + public void setSourceFromId(Long sourceFromId) { + this.sourceFromId = sourceFromId; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java index 9f700f7e..470f03f0 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnService.java @@ -17,7 +17,7 @@ import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.jlw.dao.TeacherOpenCourseHandsOnDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.vo.StudentHandsOnVO; -import com.ibeetl.jlw.enums.GlobalUpStatusEnum; +import com.ibeetl.jlw.enums.CopyFromEnum; import com.ibeetl.jlw.enums.HandsOnTaskEnum; import com.ibeetl.jlw.web.query.*; import lombok.extern.slf4j.Slf4j; @@ -655,6 +655,9 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService courseInfoIdPair, @Nullable Map resourcesQuestionIdPair ) { + if (resourcesQuestionIdPair==null){ + resourcesQuestionIdPair = new HashMap<>(); + } Date now = new Date(); CoreUser currentUser = getUser(); @@ -665,7 +668,7 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService handsOnList = handsOnService.getValuesByQuery(handsOnQuery); if (CollectionUtils.isEmpty(handsOnList)) { @@ -686,6 +689,11 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService simulationTaskOldToNewMap = new HashMap<>(); + Map finalResourcesQuestionIdPair = resourcesQuestionIdPair; teacherOpenCourseHandsOnSimulationTasksList.forEach(teacherOpenCourseHandsOnSimulationTasks -> { Long newHandsOnId = handsOnIdOldToNewMap.get(teacherOpenCourseHandsOnSimulationTasks.getHandsOnId()); teacherOpenCourseHandsOnSimulationTasks.setHandsOnId(newHandsOnId); @@ -722,8 +731,14 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService teacherOpenCourseHandsOnSimulationTasksAssessmentList = new ArrayList<>(BeanUtil.copyToList(handsOnSimulationTasksAssessmentList, TeacherOpenCourseHandsOnSimulationTasksAssessment.class)); teacherOpenCourseHandsOnSimulationTasksAssessmentList.forEach(teacherOpenCourseHandsOnSimulationTasksAssessment -> { + + //记录来源 + teacherOpenCourseHandsOnSimulationTasksAssessment.setFromType(CopyFromEnum.FROM_SYSTEM); + teacherOpenCourseHandsOnSimulationTasksAssessment.setSourceFromId( teacherOpenCourseHandsOnSimulationTasksAssessment.getHandsOnSimulationTasksAssessmentId()); + + teacherOpenCourseHandsOnSimulationTasksAssessment.setHandsOnTaskId(simulationTaskOldToNewMap.get(teacherOpenCourseHandsOnSimulationTasksAssessment.getHandsOnTaskId())); teacherOpenCourseHandsOnSimulationTasksAssessment.setHandsOnId(handsOnIdOldToNewMap.get(teacherOpenCourseHandsOnSimulationTasksAssessment.getHandsOnId())); - teacherOpenCourseHandsOnSimulationTasksAssessment.setOrgId(currentUser.getOrgId()); teacherOpenCourseHandsOnSimulationTasksAssessment.setUserId(currentUser.getId()); teacherOpenCourseHandsOnSimulationTasksAssessment.setHandsOnSimulationTasksAssessmentId(snowflake.nextId()); @@ -778,6 +799,11 @@ public class TeacherOpenCourseHandsOnService extends CoreBaseService { + + //记录来源 + item.setFromType(CopyFromEnum.FROM_SYSTEM); + item.setSourceFromId(item.getTaskFileId()); + item.setTaskId(simulationTaskOldToNewMap.get(item.getTaskId())); item.setHandsOnId(handsOnIdOldToNewMap.get(item.getHandsOnId())); item.setTeacherOpenCourseId(teacherOpenCourseId); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java index 2f300b5e..6ee8ed10 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeCourseInfoService.java @@ -20,11 +20,13 @@ import com.alibaba.fastjson.JSONObject; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.admin.core.util.user.CacheUserUtil; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.jlw.dao.TeacherOpenCourseMergeCourseInfoDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.dto.QuestionSettingDTO; +import com.ibeetl.jlw.enums.CopyFromEnum; import com.ibeetl.jlw.enums.MoveEnum; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeCourseInfoQuery; import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesInfoQuery; @@ -739,8 +741,9 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService { + for (Long courseInfoId : courseInfoIds) { // 当前的课程信息 CourseInfo currentCourseInfo = courseInfoService.getById(courseInfoId); // 查询当前课程信息下的，章节或者小节信息，返回一维集合 @@ -748,11 +751,11 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService copyToList = new ArrayList<>(); - // 类转换 + // 类转换,并记录来源的课程ID courseInfoListConvertTeacherOpenCourseMergeCourseInfoList(chapterList, copyToList); if (ObjectUtil.isNotEmpty(copyToList)) { @@ -760,6 +763,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService { item.setTeacherOpenCourseId(teacherOpenCourseId); item.setCourseInfoName(item.getCourseInfoName().replaceAll(" ", "")); + item.setOrgId(currentUser.getOrgId()); + item.setUserId(currentUser.getId()); }); // 最右侧的courseInfoIdPair 可以理解成是初始化的Map。Map特性Key是唯一的。 @@ -768,7 +773,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService { // 这里系统课程ID再拷贝一份 用于记录是从哪个课程拷贝来的。 // 这里的teacherOpenCourseMergeCourseInfoId 暂存的还是系统课程ID - item.setSystemCourseInfoId(item.getTeacherOpenCourseMergeCourseInfoId()); + item.setFromType(CopyFromEnum.FROM_SYSTEM); + item.setSourceFromId(item.getTeacherOpenCourseMergeCourseInfoId()); }); result.addAll(copyToList); @@ -823,7 +829,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService resourcesQuestionIdPair =teacherOpenCourseMergeResourcesQuestionService.copyOpenCourseQuestionToOpenCourse(teacherOpenCourseId, courseInfos, courseInfoIdPair); + Map resourcesQuestionIdPair = teacherOpenCourseMergeResourcesQuestionService.copyOpenCourseQuestionToOpenCourse(teacherOpenCourseId, courseInfos, courseInfoIdPair); // 取出来所有的课程章、节的ID。大于等于2，就是章和他的子节点.从系统题目表抽取 // teacherOpenCourseQuestionSettingService.copySystemQuestionChapterTestQuestionToOpenCourse(teacherOpenCourseId, courseInfos, courseInfoIdPair); // 从开课题库中抽取章节练习题 @@ -1401,8 +1407,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService { + for (Long oldOpenCourseInfoId : courseInfoIds) { // 源数据开课信息 TeacherOpenCourseMergeCourseInfoQuery teacherOpenCourseMergeCourseInfoQuery = new TeacherOpenCourseMergeCourseInfoQuery(); teacherOpenCourseMergeCourseInfoQuery.setTeacherOpenCourseId(oldOpenCourseInfoId); @@ -1445,6 +1451,8 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService { item.setTeacherOpenCourseId(teacherOpenCourseId); item.setCourseInfoName(item.getCourseInfoName().replaceAll(" ", "")); + item.setOrgId(currentUser.getOrgId()); + item.setUserId(currentUser.getId()); }); // 最右侧的courseInfoIdPair 可以理解成是初始化的Map。Map特性Key是唯一的。 @@ -1453,7 +1461,7 @@ public class TeacherOpenCourseMergeCourseInfoService extends CoreBaseService courseInfoIdPair) { - ResourcesInfoQuery resourcesInfoQuery = new ResourcesInfoQuery(); - resourcesInfoQuery.setCourseInfoIds(allCourseInfoIdsJoin); - List resourcesInfoList = resourcesInfoService.getValuesByQuery(resourcesInfoQuery); - - // 系统资源库ID集合 - Set resourcesInfoIds = resourcesInfoList.stream().map(ResourcesInfo::getResourcesInfoId).collect(toSet()); - // 拷贝系统资源库到教师开课 - copyFromResourcesInfo(resourcesInfoIds, teacherOpenCourseId, courseInfoIdPair); - } /** @@ -409,13 +393,21 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService< } // 拷贝部分字段映射 - CopyOptions copyOptions = CopyOptions.create().setFieldMapping(MapUtil.of("courseInfoId", "teacherOpenCourseMergeCourseInfoId")); + HashMap of = MapUtil.of("courseInfoId", "teacherOpenCourseMergeCourseInfoId"); + of.put("resourcesInfoId", "sourceFromId");//把系统资源库的ID，映射到开课资源库的sourceFromId字段 来源记录上 + CopyOptions copyOptions = CopyOptions.create().setFieldMapping(of); List copyToList = BeanUtil.copyToList(resourcesInfoList, TeacherOpenCourseMergeResourcesInfo.class, copyOptions); + + CoreUser currentUser = CacheUserUtil.getUser(); + copyToList.forEach(item -> { item.setTeacherOpenCourseId(teacherOpenCourseId); item.setOrderIndex(BigDecimal.valueOf(RandomUtil.randomDouble(100, 200, 6, RoundingMode.HALF_UP))); item.setResourcesInfoStatus(GlobalUpStatusEnum.UP); + item.setFromType(CopyFromEnum.FROM_SYSTEM); + item.setOrgId(currentUser.getOrgId()); + item.setUserId(currentUser.getId()); }); resetNewId(copyToList, courseInfoIdPair); @@ -714,10 +706,13 @@ public class TeacherOpenCourseMergeResourcesInfoService extends CoreBaseService< if (CollectionUtil.isEmpty(resourcesInfoList)) { return; } - + CoreUser currentUser = CacheUserUtil.getUser(); resourcesInfoList.forEach(item -> { + item.setTeacherOpenCourseId(teacherOpenCourseId); item.setOrderIndex(BigDecimal.valueOf(RandomUtil.randomDouble(100, 200, 6, RoundingMode.HALF_UP))); + item.setOrgId(currentUser.getOrgId()); + item.setUserId(currentUser.getId()); }); resetNewId(resourcesInfoList, courseInfoIdPair); diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java index 510639b3..fa39ae06 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeResourcesQuestionService.java @@ -14,6 +14,7 @@ import com.alibaba.fastjson.JSONObject; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.admin.core.util.user.CacheUserUtil; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.jlw.dao.ResourcesQuestionDao; @@ -22,6 +23,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.dto.QuestionSettingDTO; import com.ibeetl.jlw.entity.vo.QuestionTypeCountVO; +import com.ibeetl.jlw.enums.CopyFromEnum; import com.ibeetl.jlw.enums.GlobalUpStatusEnum; import com.ibeetl.jlw.enums.ResourcesQuestionTypeEnum; import com.ibeetl.jlw.web.query.ResourcesQuestionQuery; @@ -477,7 +479,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ // 取出所有的课程章节ID String courseInfoIds = allCourseInfo.stream().map(item -> item.getCourseInfoId().toString()).collect(joining(",")); resourcesQuestionQuery.setCourseInfoIds(courseInfoIds); - resourcesQuestionQuery.setQuestionStatus(1); + //resourcesQuestionQuery.setQuestionStatus(1); List resourcesQuestionList = resourcesQuestionService.getValuesByQuery(resourcesQuestionQuery); // 系统题目库ID集合 @@ -506,12 +508,16 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ if (ObjectUtil.isEmpty(systemResourcesQuestionIds)) { return new HashMap<>(); } + + CoreUser currentUser = CacheUserUtil.getUser(); + // 题目ID集合 String ids = join(systemResourcesQuestionIds.toArray(), ","); ResourcesQuestionQuery resourcesQuestionQuery = new ResourcesQuestionQuery(); resourcesQuestionQuery.setResourcesQuestionIds(ids); // 已上架的 resourcesQuestionQuery.setQuestionStatus(1); + //原始题目数据 List resourcesQuestions = resourcesQuestionDao.getValuesByQuery(resourcesQuestionQuery); // 转换后的数据暂存 @@ -519,7 +525,11 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ // 类转换方法 Map resourcesQuestionIdPair = resourcesQuestionConvertToTeacherOpenCourseMergeResourcesQuestion(resourcesQuestions, convertedList, courseInfoIdPair); // 设置开课ID - convertedList.forEach(item -> item.setTeacherOpenCourseId(teacherOpenCourseId)); + convertedList.forEach(item -> { + item.setTeacherOpenCourseId(teacherOpenCourseId); + item.setUserId(currentUser.getId()); + item.setOrgId(currentUser.getOrgId()); + }); // 批量插入 teacherOpenCourseMergeResourcesQuestionDao.insertBatch(convertedList); @@ -548,12 +558,18 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ // 主动更改Id，并记录映射关系 for (TeacherOpenCourseMergeResourcesQuestion teacherOpenCourseMergeResourcesQuestion : to) { - long newId = snowflake.nextId(); + //题目的旧Id + Long teacherOpenCourseMergeResourcesQuestionId = teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId(); + teacherOpenCourseMergeResourcesQuestion.setFromType(CopyFromEnum.FROM_SYSTEM); + teacherOpenCourseMergeResourcesQuestion.setSourceFromId(teacherOpenCourseMergeResourcesQuestionId); + + long newId = snowflake.nextId(); // 记录映射关系 resourcesQuestionIdPair.put(teacherOpenCourseMergeResourcesQuestion.getTeacherOpenCourseMergeResourcesQuestionId(), newId); teacherOpenCourseMergeResourcesQuestion.setTeacherOpenCourseMergeResourcesQuestionId(newId); + } if (ObjectUtil.isAllEmpty(to, courseInfoIdPair)) { @@ -700,7 +716,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ String teacherOpenCourseMergeCourseInfoIds = allTeacherOpenCourseMergeCourseInfo.stream().map(item -> item.getTeacherOpenCourseMergeCourseInfoId().toString()).collect(joining(",")); TeacherOpenCourseMergeResourcesQuestionQuery teacherOpenCourseMergeResourcesQuestionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery(); teacherOpenCourseMergeResourcesQuestionQuery.setTeacherOpenCourseMergeCourseInfoIdPlural(teacherOpenCourseMergeCourseInfoIds); - teacherOpenCourseMergeResourcesQuestionQuery.setQuestionStatus(1); + //teacherOpenCourseMergeResourcesQuestionQuery.setQuestionStatus(1); List questionList = getValuesByQuery(teacherOpenCourseMergeResourcesQuestionQuery); @@ -728,7 +744,7 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ if (ObjectUtil.isEmpty(questionList)) { return new HashMap<>(); } - + CoreUser currentUser = CacheUserUtil.getUser(); // 转换后的数据暂存 List convertedList = new ArrayList<>(); @@ -742,6 +758,8 @@ public class TeacherOpenCourseMergeResourcesQuestionService extends CoreBaseServ long newId = snowflake.nextId(); questionIdMapOldAndNew.put(oldId, newId); item.setTeacherOpenCourseMergeResourcesQuestionId(newId); + item.setOrgId(currentUser.getOrgId()); + item.setUserId(currentUser.getId()); } ); // 批量插入 diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java index 626612c0..6a08f768 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionSettingService.java @@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONObject; import com.ibeetl.admin.core.entity.CoreUser; import com.ibeetl.admin.core.service.CoreBaseService; import com.ibeetl.admin.core.util.PlatformException; +import com.ibeetl.admin.core.util.user.CacheUserUtil; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.jlw.dao.*; @@ -683,6 +684,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService chapterSet = list.stream() .filter(item -> Integer.valueOf(2).equals(item.getCourseInfoType())).collect(Collectors.toSet()); @@ -710,6 +713,8 @@ public class TeacherOpenCourseQuestionSettingService extends CoreBaseService resourcesQuestionSnapshots = BeanUtil.copyToList(resourcesQuestionList, ResourcesQuestionSnapshot.class); - resourcesQuestionSnapshots.forEach(item -> item.setTeacherOpenCourseQuestionSettingId(questionSettingQuery.getTeacherOpenCourseQuestionSettingId())); + resourcesQuestionSnapshots.forEach(item -> { + item.setTeacherOpenCourseQuestionSettingId(questionSettingQuery.getTeacherOpenCourseQuestionSettingId()); + item.setOrgId(currentUser.getOrgId()); + item.setUserId(currentUser.getId()); + }); // 批量添加题目快照 resourcesQuestionSnapshotService.insertBatch(resourcesQuestionSnapshots); } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java index 28f89958..f2eca469 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseScoreDashboardService.java @@ -622,7 +622,7 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService> questionLogSummaryMap = questionLogSummaryList.stream().collect(Collectors.groupingBy(QuestionLogSummary::getQuestionSettingId)); //按正确率计算 - if (weight == null || "1".equals(weight.getCoursePracticeResultSetting())) { + if (weight == null || "1".equals(weight.getChapterContactResultSetting())) { //总章节练习数 int baseSize = teacherOpenCourseQuestionSettingIdList.size(); //总正确率 @@ -644,7 +644,7 @@ public class TeacherOpenCourseScoreDashboardService extends CoreBaseService