From e80d90bf5e5f2b8e72f02454606f1f432cbab7fd Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 06 六月 2024 18:01:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 30937ca..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,21 +1,24 @@
package com.ycl.jxkg.controller.admin;
+import com.github.pagehelper.PageInfo;
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
-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.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 com.ycl.jxkg.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
-import com.ycl.jxkg.vo.admin.paper.ExamPaperAnswerPageRequestVO;
-import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+@RequiredArgsConstructor
@RestController("AdminExamPaperAnswerController")
@RequestMapping(value = "/api/admin/examPaperAnswer")
public class ExamPaperAnswerController extends BaseApiController {
@@ -24,13 +27,10 @@
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 Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageJudgeList(@RequestBody ExamPaperAnswerPageRequestVO model) {
@@ -38,14 +38,14 @@
PageInfo<ExamPaperAnswerPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
ExamPaperAnswerPageResponseVO vo = new ExamPaperAnswerPageResponseVO();
BeanUtils.copyProperties(e, vo);
- Subject subject = subjectService.selectById(vo.getSubjectId());
+ 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.selectById(e.getCreateUser());
+ User user = userService.getById(e.getCreateUser());
vo.setUserName(user.getUserName());
return vo;
});
--
Gitblit v1.8.0