From 2b450350c1737ea90ab9efe8c00cde6635648516 Mon Sep 17 00:00:00 2001 From: maLix Date: Mon, 26 Jun 2023 00:50:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=9F=A5=E8=AF=A2=E5=AE=9E?= =?UTF-8?q?=E8=AE=AD=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/web/TeacherOpenCourseHandsOnController.java | 11 +++++++++++ .../main/resources/sql/jlw/handsOnSimulationTasks.md | 9 +++++++++ 2 files changed, 20 insertions(+) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java index 785d9bcc..fd001ed7 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java @@ -14,10 +14,14 @@ import com.ibeetl.admin.core.util.TimeTool; import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOn; import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnList; +import com.ibeetl.jlw.entity.TeacherOpenCourseHandsOnSimulationTasks; import com.ibeetl.jlw.entity.vo.StudentHandsOnVO; +import com.ibeetl.jlw.service.HandsOnSimulationTasksService; import com.ibeetl.jlw.service.TeacherOpenCourseHandsOnService; +import com.ibeetl.jlw.service.TeacherOpenCourseHandsOnSimulationTasksService; import com.ibeetl.jlw.web.query.GetHandsOnListParam; import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnQuery; +import com.ibeetl.jlw.web.query.TeacherOpenCourseHandsOnSimulationTasksQuery; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,6 +63,8 @@ public class TeacherOpenCourseHandsOnController{ @Autowired private TeacherOpenCourseHandsOnService teacherOpenCourseHandsOnService; + @Autowired private HandsOnSimulationTasksService handsOnSimulationTasksService; + @Autowired private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService; @Autowired FileService fileService; @@ -195,7 +201,12 @@ public class TeacherOpenCourseHandsOnController{ public ModelAndView edit(Long handsOnId) { ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/edit.html"); TeacherOpenCourseHandsOn teacherOpenCourseHandsOn = teacherOpenCourseHandsOnService.queryById(handsOnId); + + TeacherOpenCourseHandsOnSimulationTasksQuery tasksQuery = new TeacherOpenCourseHandsOnSimulationTasksQuery(); + tasksQuery.setTeacherOpenCourseId(teacherOpenCourseHandsOn.getTeacherOpenCourseId()); + List tocTasks = teacherOpenCourseHandsOnSimulationTasksService.getValuesByQueryNotWithPermission(tasksQuery); view.addObject("teacherOpenCourseHandsOn", teacherOpenCourseHandsOn); + view.addObject("handsOnSimulationTasks", tocTasks); return view; } diff --git a/web/src/main/resources/sql/jlw/handsOnSimulationTasks.md b/web/src/main/resources/sql/jlw/handsOnSimulationTasks.md index 331077e8..53526514 100644 --- a/web/src/main/resources/sql/jlw/handsOnSimulationTasks.md +++ b/web/src/main/resources/sql/jlw/handsOnSimulationTasks.md @@ -453,3 +453,12 @@ getValuesByQueryNotPermission @if(!isEmpty(addTime)){ and t.add_time =#addTime# @} + + +queryObjectByHandsOnIds +=== + +* 根据开课ID查询 + + select * from hands_on_simulation_tasks t + where t.hands_on_id in( #join(handsOnIds)#)