From c227e3938798eb7d529575ba1f3ea1c56ae63cfe Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期一, 01 七月 2024 13:16:34 +0800 Subject: [PATCH] refactor:恢复成绩接口 --- src/main/java/com/ycl/jxkg/controller/wx/student/ExamPaperAnswerController.java | 59 +++++++++++++++++++++++------------------------------------ 1 files changed, 23 insertions(+), 36 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..9df49bf 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 @@ -2,35 +2,22 @@ import com.ycl.jxkg.base.Result; import com.ycl.jxkg.controller.wx.BaseWXApiController; -import com.ycl.jxkg.domain.*; import com.ycl.jxkg.domain.entity.ExamPaperScore; -import com.ycl.jxkg.domain.entity.Subject; -import com.ycl.jxkg.domain.entity.User; -import com.ycl.jxkg.domain.entity.UserEventLog; -import com.ycl.jxkg.enums.QuestionTypeEnum; -import com.ycl.jxkg.event.CalculateExamPaperAnswerCompleteEvent; -import com.ycl.jxkg.event.UserEvent; -import com.ycl.jxkg.service.ExamPaperScoreService; -import com.ycl.jxkg.service.ExamPaperService; -import com.ycl.jxkg.service.SubjectService; -import com.ycl.jxkg.utils.DateTimeUtil; -import com.ycl.jxkg.utils.ExamUtil; -import com.ycl.jxkg.utils.PageInfoHelper; import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO; -import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO; -import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageVO; -import com.github.pagehelper.PageInfo; import com.ycl.jxkg.domain.vo.student.exam.ExamPaperReadVO; import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitItemVO; import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO; +import com.ycl.jxkg.enums.QuestionTypeEnum; +import com.ycl.jxkg.service.ExamPaperScoreService; +import com.ycl.jxkg.service.ExamPaperService; +import com.ycl.jxkg.service.SubjectService; +import com.ycl.jxkg.utils.ExamUtil; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; import java.util.*; import java.util.stream.Collectors; @@ -45,24 +32,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