From 6e3cadcd7a380982796df410a90e98977a9a2709 Mon Sep 17 00:00:00 2001 From: Mlxa0324 <mlx950324@163.com> Date: Sat, 14 Jan 2023 13:50:22 +0800 Subject: [PATCH] 1 --- .../jlw/service/TeacherOpenCourseQuestionLogService.java | 6 +++--- .../jlw/web/TeacherOpenCourseQuestionLogController.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java index 5abec685..e77f6ce9 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseQuestionLogService.java @@ -22,7 +22,7 @@ import com.ibeetl.jlw.dao.TeacherOpenCourseQuestionSettingDao; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO; import com.ibeetl.jlw.entity.dto.TeacherOpenCourseHomeWorkLogDTO; -import com.ibeetl.jlw.entity.vo.FileQuestionLogListPageVO; +import com.ibeetl.jlw.entity.vo.FileQuestionLogListVO; import com.ibeetl.jlw.entity.vo.TeacherOpenCourseHomeWorkLogExportVO; import com.ibeetl.jlw.entity.vo.TeacherOpenCourseQuestionLogAnswerLockVO; import com.ibeetl.jlw.enums.QuestionLogAddTypeEnum; @@ -1100,7 +1100,7 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher return teacherOpenCourseQuestionLogDao.getHomeWorkLogExportPageList(pageQuery); } - public FileQuestionLogListPageVO getFileQuestionLog(TeacherOpenCourseQuestionLogQuery query) { + public FileQuestionLogListVO getFileQuestionLog(TeacherOpenCourseQuestionLogQuery query) { TeacherOpenCourseQuestionLog log = getInfo(query); if (null == log) { return null; @@ -1112,6 +1112,6 @@ public class TeacherOpenCourseQuestionLogService extends CoreBaseService<Teacher log.setStudentSn(student.getStudentSn()); } - return BeanUtil.copyProperties(log, FileQuestionLogListPageVO.class); + return BeanUtil.copyProperties(log, FileQuestionLogListVO.class); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java index 3787ab47..908b2a60 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseQuestionLogController.java @@ -21,7 +21,7 @@ import com.ibeetl.jlw.entity.dto.FileQuestionLogListDTO; import com.ibeetl.jlw.entity.dto.QuestionLogAddDTO; import com.ibeetl.jlw.entity.dto.TeacherOpenCourseHomeWorkLogDTO; import com.ibeetl.jlw.entity.dto.TeacherOpenCourseHomeWorkLogPageDTO; -import com.ibeetl.jlw.entity.vo.FileQuestionLogListPageVO; +import com.ibeetl.jlw.entity.vo.FileQuestionLogListVO; import com.ibeetl.jlw.entity.vo.TeacherOpenCourseHomeWorkLogExportVO; import com.ibeetl.jlw.service.TeacherOpenCourseQuestionLogService; import com.ibeetl.jlw.web.query.TeacherOpenCourseQuestionLogQuery; @@ -111,7 +111,7 @@ public class TeacherOpenCourseQuestionLogController extends BaseController { */ @GetMapping(API + "/getFileQuestionLog.do") @ResponseBody - public JsonResult<FileQuestionLogListPageVO> getFileQuestionLog(FileQuestionLogListDTO dto, @SCoreUser CoreUser coreUser) { + public JsonResult<FileQuestionLogListVO> getFileQuestionLog(FileQuestionLogListDTO dto, @SCoreUser CoreUser coreUser) { TeacherOpenCourseQuestionLogQuery query = BeanUtil.copyProperties(dto, TeacherOpenCourseQuestionLogQuery.class); return JsonResult.success(teacherOpenCourseQuestionLogService.getFileQuestionLog(query)); }