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/student/ExamPaperAnswerController.java | 34 ++++++---------------------------- 1 files changed, 6 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java index 1f3c735..fe52355 100644 --- a/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java +++ b/src/main/java/com/ycl/jxkg/controller/student/ExamPaperAnswerController.java @@ -1,34 +1,24 @@ package com.ycl.jxkg.controller.student; +import com.github.pagehelper.PageInfo; import com.ycl.jxkg.base.BaseApiController; import com.ycl.jxkg.base.Result; -import com.ycl.jxkg.domain.*; +import com.ycl.jxkg.domain.ExamPaperAnswerInfo; 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.ExamPaperAnswerStatusEnum; -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.exam.ExamPaperReadVO; import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO; 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.service.ExamPaperScoreService; +import com.ycl.jxkg.service.ExamPaperService; +import com.ycl.jxkg.service.SubjectService; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.context.ApplicationEventPublisher; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.Date; @RequiredArgsConstructor @RestController("StudentExamPaperAnswerController") @@ -44,19 +34,7 @@ @RequestMapping(value = "/pageList", method = RequestMethod.POST) public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageList(@RequestBody @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; - }); + PageInfo<ExamPaperAnswerPageResponseVO> page = examPaperScoreService.studentPage(model); return Result.ok(page); } -- Gitblit v1.8.0