diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java index 689de925..d81ddb81 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseChatLogController.java @@ -258,6 +258,7 @@ public class TeacherOpenCourseChatLogController extends BaseController { /** *@author 姚丹 *@data 2023/01/15 + * 讨论详情 * */ @GetMapping(MODEL + "/indexInfoNor.do") @@ -269,6 +270,34 @@ public class TeacherOpenCourseChatLogController extends BaseController { return view; } + /** + *@author 姚丹 + *@data 2023/01/16 + * 学生提问详情 + */ + @GetMapping(MODEL + "/indexInfoStu.do") + @Function("teacherOpenCourseChatLog.query") + public ModelAndView indexInfoStu(Long teacherOpenCourseId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseChatLog/indexInfoStu.html"); + view.addObject("search", TeacherOpenCourseChatLogQuery.class.getName()); + view.addObject("teacherOpenCourseId", teacherOpenCourseId); + return view; + } + + /** + *@author 姚丹 + *@data 2023/01/16 + * 教师提问_详情 + */ + @GetMapping(MODEL + "/indexInfoSpe.do") + @Function("teacherOpenCourseChatLog.query") + public ModelAndView indexInfoSpe(Long teacherOpenCourseId) { + ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseChatLog/indexInfoSpe.html"); + view.addObject("search", TeacherOpenCourseChatLogQuery.class.getName()); + view.addObject("teacherOpenCourseId", teacherOpenCourseId); + return view; + } + @GetMapping(MODEL + "/edit.do") @Function("teacherOpenCourseChatLog.edit") public ModelAndView edit(Long teacherOpenCourseChatLogId) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java index 4252d5c5..8ea371bc 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseChatLogQuery.java @@ -36,15 +36,15 @@ public class TeacherOpenCourseChatLogQuery extends PageParam { @Query(name = "上级ID", display = false) private Long teacherOpenCourseChatLogParentId; @NotNull(message = "课程开课ID不能为空", groups ={ ValidateConfig.ADD.class, TEACHER_ADD.class, STUDENT_ADD.class }) - @Query(name = "课程开课ID", display = true,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") + @Query(name = "课程开课ID", display = false,type=Query.TYPE_DICT,dict="teacher_open_course.teacher_open_course_title.teacher_open_course_status=1") private Long teacherOpenCourseId; @Query(name = "班级ID集合", display = false) private String schoolClassIds; // @NotNull(message = "教师ID不能为空", groups ={ ValidateConfig.ADD.class, TEACHER_ADD.class }) - @Query(name = "教师ID", display = true,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1") + @Query(name = "教师ID", display = false,type=Query.TYPE_DICT,dict="teacher.teacher_name.teacher_status=1") private Long teacherId; // @NotNull(message = "学生ID不能为空", groups ={ ValidateConfig.ADD.class, STUDENT_ADD.class }) - @Query(name = "学生ID", display = true,type=Query.TYPE_DICT,dict="student.student_name.student_status=1") + @Query(name = "学生ID", display = false,type=Query.TYPE_DICT,dict="student.student_name.student_status=1") private Long studentId; @NotNull(message = "讨论内容不能为空", groups ={ ValidateConfig.ADD.class, TEACHER_ADD.class, STUDENT_ADD.class }) @Query(name = "讨论内容", display = false) @@ -58,7 +58,7 @@ public class TeacherOpenCourseChatLogQuery extends PageParam { @Query(name = "附件上传(仅支持图片,多个逗号隔开)", display = false) private String chatFiles; - @Query(name = "状态 (1正常 2删除)", display = true,type=Query.TYPE_DICT,dict="global_status") + @Query(name = "状态 (1正常 2删除)", display = false,type=Query.TYPE_DICT,dict="global_status") private Integer teacherOpenCourseChatLogStatus; @Query(name = "创建时间", display = false) private Date teacherOpenCourseChatLogAddTime; diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js index 4352caeb..8dcc10d2 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseMergeCourseInfo/index.js @@ -177,7 +177,7 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) { var url = "/jlw/questionLogSummary/index.do?teacherOpenCourseId=" + data.teacherOpenCourseId + "&questionSettingType=EXAM"; Common.openDlg(url,"《"+title+"》/ 考试存档"); }else if(obj.event === "hd"){ - var url = "/jlw/teacherOpenCourseChatLog/index.do?teacherOpenCourseId="+data.teacherOpenCourseId; + var url = "/jlw/teacherOpenCourseChatLog/indexInfoSpe.do?teacherOpenCourseId="+data.teacherOpenCourseId; Common.openDlg(url,"《"+title+"》/ 互动存档"); } }) diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/index.html b/web/src/main/resources/templates/jlw/questionLogSummary/index.html index 3cfd045e..15475844 100644 --- a/web/src/main/resources/templates/jlw/questionLogSummary/index.html +++ b/web/src/main/resources/templates/jlw/questionLogSummary/index.html @@ -1,11 +1,9 @@