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 c3de433d..df8dc84a 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseHandsOnSimulationTasks.java @@ -89,7 +89,11 @@ public class TeacherOpenCourseHandsOnSimulationTasks extends BaseEntity{ private String teacherOpenCourseHandsOnSimulationTasksFile; private List teacherOpenCourseHandsOnSimulationTasksFileList; - + /** + * 实操题目列表 + */ + private String teacherOpenCourseHandsOnSimulationTasksAssessment; + private List teacherOpenCourseHandsOnSimulationTasksAssessmentList; private List handsOnTaskProblemVo; @@ -374,4 +378,20 @@ public class TeacherOpenCourseHandsOnSimulationTasks extends BaseEntity{ 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; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java index 295cfaa2..35b85468 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java @@ -278,6 +278,14 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ } TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks = list.get(0); Long taskId = teacherOpenCourseHandsOnSimulationTasks.getTaskId(); + TeacherOpenCourseHandsOnSimulationTasksAssessmentQuery assessmentQuery = new TeacherOpenCourseHandsOnSimulationTasksAssessmentQuery(); + assessmentQuery.setHandsOnTaskId(taskId); + List assessmentList = teacherOpenCourseHandsOnSimulationTasksAssessmentService.getValuesByQuery(assessmentQuery); + if (CollectionUtils.isNotEmpty(assessmentList)) { + teacherOpenCourseHandsOnSimulationTasks.setTeacherOpenCourseHandsOnSimulationTasksAssessmentList(assessmentList); + teacherOpenCourseHandsOnSimulationTasks.setTeacherOpenCourseHandsOnSimulationTasksAssessment(JSONArray.toJSONString(assessmentList)); + } + TeacherOpenCourseHandsOnSimulationTasksFileQuery query = new TeacherOpenCourseHandsOnSimulationTasksFileQuery(); query.setTaskId(taskId); List valuesByQuery = teacherOpenCourseHandsOnSimulationTasksFileService.getValuesByQuery(query);