From 81dfe248054eaa3c2751ba32576f48598adcd04f Mon Sep 17 00:00:00 2001
From: qirong <2032486488@qq.com>
Date: 星期四, 17 八月 2023 17:19:00 +0800
Subject: [PATCH] 个人模拟修改
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
index 2386435..0f7dfc1 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperController.java
@@ -35,6 +35,7 @@
@RequestMapping(value = "/page", method = RequestMethod.POST)
public RestResponse<PageInfo<ExamResponseVM>> pageList(@RequestBody ExamPaperPageRequestVM model) {
+ model.setType("0");
PageInfo<ExamPaper> pageInfo = examPaperService.page(model);
PageInfo<ExamResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
ExamResponseVM vm = modelMapper.map(e, ExamResponseVM.class);
@@ -54,6 +55,9 @@
PageInfo<ExamResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
ExamResponseVM vm = modelMapper.map(e, ExamResponseVM.class);
vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
+ Integer[] ids = examPaperSubjectService.getByExamPaperId(vm.getId())
+ .stream().map(ExamPaperSubject::getSubjectId).toArray(Integer[]::new);
+ vm.setSubjectId(ids);
return vm;
});
return RestResponse.ok(page);
@@ -62,7 +66,7 @@
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public RestResponse<ExamPaperEditRequestVM> edit(@RequestBody @Valid ExamPaperEditRequestVM model) {
+ public RestResponse<ExamPaperEditRequestVM> edit(@RequestBody @Valid ExamPaperEditRequestVM model) throws Exception {
ExamPaper examPaper = examPaperService.savePaperFromVM(model, getCurrentUser());
ExamPaperEditRequestVM newVM = examPaperService.examPaperToVM(examPaper.getId());
return RestResponse.ok(newVM);
--
Gitblit v1.8.0