From 2354b39c08f9cbe6c2878ee768abd9748c3c21b5 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 06 六月 2024 17:26:46 +0800
Subject: [PATCH] feat：成绩管理-试卷展示
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java | 66 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
index 2e42c36..2cc7adc 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
@@ -1,20 +1,24 @@
package com.ycl.jxkg.controller.admin;
-import com.ycl.jxkg.base.BaseApiController;
-import com.ycl.jxkg.base.RestResponse;
-import com.ycl.jxkg.domain.ExamPaperAnswer;
-import com.ycl.jxkg.domain.Subject;
-import com.ycl.jxkg.domain.User;
-import com.ycl.jxkg.service.*;
-import com.ycl.jxkg.utility.DateTimeUtil;
-import com.ycl.jxkg.utility.ExamUtil;
-import com.ycl.jxkg.utility.PageInfoHelper;
-import com.ycl.jxkg.viewmodel.student.exampaper.ExamPaperAnswerPageResponseVM;
-import com.ycl.jxkg.viewmodel.admin.paper.ExamPaperAnswerPageRequestVM;
import com.github.pagehelper.PageInfo;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.ycl.jxkg.base.BaseApiController;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
+import com.ycl.jxkg.domain.entity.Subject;
+import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO;
+import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
+import com.ycl.jxkg.service.ExamPaperAnswerService;
+import com.ycl.jxkg.service.SubjectService;
+import com.ycl.jxkg.service.UserService;
+import com.ycl.jxkg.utils.DateTimeUtil;
+import com.ycl.jxkg.utils.ExamUtil;
+import com.ycl.jxkg.utils.PageInfoHelper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.web.bind.annotation.*;
+@RequiredArgsConstructor
@RestController("AdminExamPaperAnswerController")
@RequestMapping(value = "/api/admin/examPaperAnswer")
public class ExamPaperAnswerController extends BaseApiController {
@@ -23,31 +27,29 @@
private final SubjectService subjectService;
private final UserService userService;
- @Autowired
- public ExamPaperAnswerController(ExamPaperAnswerService examPaperAnswerService, SubjectService subjectService, UserService userService) {
- this.examPaperAnswerService = examPaperAnswerService;
- this.subjectService = subjectService;
- this.userService = userService;
+ @PostMapping("/pageExamPaper")
+ public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageExamPaper(@RequestBody ExamPaperAnswerPageRequestVO model) {
+ return Result.ok(examPaperAnswerService.pageExamPaper(model));
}
-
@RequestMapping(value = "/page", method = RequestMethod.POST)
- public RestResponse<PageInfo<ExamPaperAnswerPageResponseVM>> pageJudgeList(@RequestBody ExamPaperAnswerPageRequestVM model) {
+ public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageJudgeList(@RequestBody ExamPaperAnswerPageRequestVO model) {
PageInfo<ExamPaperAnswer> pageInfo = examPaperAnswerService.adminPage(model);
- PageInfo<ExamPaperAnswerPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamPaperAnswerPageResponseVM vm = modelMapper.map(e, ExamPaperAnswerPageResponseVM.class);
- Subject subject = subjectService.selectById(vm.getSubjectId());
- vm.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
- vm.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
- vm.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
- vm.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
- vm.setSubjectName(subject.getName());
- vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- User user = userService.selectById(e.getCreateUser());
- vm.setUserName(user.getUserName());
- return vm;
+ 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()));
+ User user = userService.getById(e.getCreateUser());
+ vo.setUserName(user.getUserName());
+ return vo;
});
- return RestResponse.ok(page);
+ return Result.ok(page);
}
--
Gitblit v1.8.0