From 0b357d525c83203162eb053aed9c87604156f94a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 09 七月 2024 10:58:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_dept'
---
src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java
index 35210ad..fd52320 100644
--- a/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java
@@ -13,6 +13,7 @@
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
+import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVO;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageResponseVM;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageVM;
import com.github.pagehelper.PageInfo;
@@ -45,10 +46,15 @@
}
+ /**
+ * 寮�濮嬭�冭瘯
+ *
+ * @param id
+ * @return
+ */
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
- public RestResponse<ExamPaperEditRequestVM> select(@PathVariable Integer id) {
- ExamPaperEditRequestVM vm = examPaperService.examPaperToVM(id);
- return RestResponse.ok(vm);
+ public RestResponse<ExamPaperEditRequestVO> select(@PathVariable Integer id) {
+ return RestResponse.ok(examPaperService.examPaperToVM(id));
}
@@ -85,7 +91,7 @@
}
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public RestResponse<ExamPaperEditRequestVM> edit(@RequestBody @Valid ExamPaperEditRequestVM model) throws Exception {
+ public RestResponse<ExamPaperEditRequestVO> edit(@RequestBody @Valid ExamPaperEditRequestVM model) throws Exception {
ExamPaperUser examPaperUser = new ExamPaperUser();
User user = getCurrentUser();
model.setDepartmentIds(new Integer[0]);
@@ -97,8 +103,6 @@
examPaperUser.setDeleted("0");
examPaperUserService.add(examPaperUser);
-
- ExamPaperEditRequestVM newVM = examPaperService.examPaperToVM(examPaper.getId());
- return RestResponse.ok(newVM);
+ return RestResponse.ok(examPaperService.examPaperToVM(examPaper.getId()));
}
}
--
Gitblit v1.8.0