From 32801f699527f450a226b34a91a466ffa27e009b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 01 七月 2024 13:08:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
index c1893b6..c287a66 100644
--- a/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java
@@ -45,24 +45,24 @@
private final ApplicationEventPublisher eventPublisher;
private final ExamPaperService examPaperService;
- @RequestMapping(value = "/pageList", method = RequestMethod.POST)
- public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageList(@Valid ExamPaperAnswerPageVO model) {
- model.setCreateUser(getCurrentUser().getId());
- PageInfo<ExamPaperScore> pageInfo = examPaperScoreService.studentPage(model);
- PageInfo<ExamPaperAnswerPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamPaperAnswerPageResponseVO vo = new ExamPaperAnswerPageResponseVO();
- BeanUtils.copyProperties(e, vo);
- Subject subject = subjectService.getById(vo.getSubjectId());
- vo.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
-// vo.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
-// vo.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
-// vo.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
- vo.setSubjectName(subject.getName());
-// vo.setCreateTime(DateTimeUtil.dateFormat(e.get));
- return vo;
- });
- return Result.ok(page);
- }
+// @RequestMapping(value = "/pageList", method = RequestMethod.POST)
+// public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageList(@Valid ExamPaperAnswerPageVO model) {
+// model.setCreateUser(getCurrentUser().getId());
+// PageInfo<ExamPaperScore> pageInfo = examPaperScoreService.studentPage(model);
+// PageInfo<ExamPaperAnswerPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
+// ExamPaperAnswerPageResponseVO vo = new ExamPaperAnswerPageResponseVO();
+// BeanUtils.copyProperties(e, vo);
+// Subject subject = subjectService.getById(vo.getSubjectId());
+// vo.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
+// // vo.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
+// // vo.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
+// // vo.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
+// vo.setSubjectName(subject.getName());
+// vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
+// return vo;
+// });
+// return Result.ok(page);
+// }
@RequestMapping(value = "/answerSubmit", method = RequestMethod.POST)
--
Gitblit v1.8.0