From d0ba0324430a0010ecf47e5cc0e4df609d586cfd Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 六月 2024 11:31:00 +0800
Subject: [PATCH] 会议学生端查询
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 90 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
index 1f543ec..09d7409 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
@@ -2,63 +2,75 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.ExamPaper;
+import com.ycl.jxkg.domain.entity.ExamPaper;
+import com.ycl.jxkg.domain.entity.ExamPaperQuestion;
+import com.ycl.jxkg.domain.form.ExamPaperForm;
+import com.ycl.jxkg.enums.VisibilityEnum;
+import com.ycl.jxkg.group.Add;
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.mapper.ExamPaperMapper;
+import com.ycl.jxkg.service.ExamPaperQuestionService;
import com.ycl.jxkg.service.ExamPaperService;
-import com.ycl.jxkg.utils.DateTimeUtil;
-import com.ycl.jxkg.utils.PageInfoHelper;
-import com.ycl.jxkg.vo.admin.exam.ExamPaperPageRequestVO;
-import com.ycl.jxkg.vo.admin.exam.ExamPaperEditRequestVO;
-import com.ycl.jxkg.vo.admin.exam.ExamResponseVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperPageRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamResponseVO;
import com.github.pagehelper.PageInfo;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
-import javax.validation.Valid;
+import java.util.Date;
+import java.util.List;
+@Validated
@RequiredArgsConstructor
@RestController("AdminExamPaperController")
@RequestMapping(value = "/api/admin/exam/paper")
public class ExamPaperController extends BaseApiController {
-
- private final ExamPaperService examPaperService;
+ @Autowired
+ private ExamPaperService examPaperService;
+ @Autowired
+ private ExamPaperQuestionService examPaperQuestionService;
+ @Autowired
+ private ExamPaperMapper baseMapper;
@RequestMapping(value = "/page", method = RequestMethod.POST)
public Result<PageInfo<ExamResponseVO>> pageList(@RequestBody ExamPaperPageRequestVO model) {
- PageInfo<ExamPaper> pageInfo = examPaperService.page(model);
- PageInfo<ExamResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamResponseVO vo = new ExamResponseVO();
- BeanUtils.copyProperties(e, vo);
- vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- return vo;
- });
+ PageInfo<ExamResponseVO> page = examPaperService.page(model);
return Result.ok(page);
}
+ @RequestMapping(value = "/addPaper", method = RequestMethod.POST)
+ public Result taskExamPageList(@RequestBody @Validated(Add.class) ExamPaperForm form) {
+ if (!StringUtils.isBlank(form.getVisibility())) {
+ form.setVisibility(VisibilityEnum.fromCode(form.getVisibility()).getName());
+ }
+ form.setCreateUser(getCurrentUser().getId());
+ form.setCreateTime(new Date());
-
- @RequestMapping(value = "/taskExamPage", method = RequestMethod.POST)
- public Result<PageInfo<ExamResponseVO>> taskExamPageList(@RequestBody ExamPaperPageRequestVO model) {
- PageInfo<ExamPaper> pageInfo = examPaperService.taskExamPage(model);
- PageInfo<ExamResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamResponseVO vo = new ExamResponseVO();
- BeanUtils.copyProperties(e, vo);
- vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- return vo;
- });
- return Result.ok(page);
+ return examPaperService.addPaper(form);
}
-
-
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public Result<ExamPaperEditRequestVO> edit(@RequestBody @Valid ExamPaperEditRequestVO model) {
- ExamPaper examPaper = examPaperService.savePaperFromVM(model, getCurrentUser());
- ExamPaperEditRequestVO newVM = examPaperService.examPaperToVM(examPaper.getId());
- return Result.ok(newVM);
+ public Result edit(@RequestBody @Validated(Update.class) ExamPaperForm form) {
+ if (!StringUtils.isBlank(form.getVisibility())) {
+ form.setVisibility(VisibilityEnum.fromCode(form.getVisibility()).getName());
+ }
+ return examPaperService.updateExamPaper(form);
}
+ @RequestMapping(value = "/editQuestion", method = RequestMethod.POST)
+ public Result editQuestion(@RequestBody ExamPaperForm form) {
+
+ return Result.ok();
+ }
+ @RequestMapping(value = "/selectQuestion/{id}", method = RequestMethod.POST)
+ public Result<ExamPaperQuestion> selectQuestion(@PathVariable Integer id) {
+ ExamPaperQuestion vo = examPaperQuestionService.selectById(id);
+ return Result.ok(vo);
+ }
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
public Result<ExamPaperEditRequestVO> select(@PathVariable Integer id) {
ExamPaperEditRequestVO vm = examPaperService.examPaperToVM(id);
@@ -67,9 +79,13 @@
@RequestMapping(value = "/delete/{id}", method = RequestMethod.POST)
public Result delete(@PathVariable Integer id) {
- ExamPaper examPaper = examPaperService.getById(id);
- examPaper.setDeleted(true);
- examPaperService.updateById(examPaper);
+ baseMapper.deleteById(id);
return Result.ok();
}
+
+ @GetMapping("/my")
+ public Result myExamPaper(Integer paperType) {
+ List<ExamPaper> list = examPaperService.myExamPaper(paperType);
+ return Result.ok(list);
+ }
}
--
Gitblit v1.8.0