From c3432d4eef8e6545708e30004189ca3f27b8a067 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 04 七月 2024 17:58:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java | 16 +++-------------
1 files changed, 3 insertions(+), 13 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 ad3a1f7..09d7409 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperController.java
@@ -5,29 +5,22 @@
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.domain.question.TemplateQuestionDTO;
-import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperQuestionVO;
-import com.ycl.jxkg.enums.ExamPaperTypeEnum;
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.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.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
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;
@@ -49,7 +42,6 @@
return Result.ok(page);
}
-
@RequestMapping(value = "/addPaper", method = RequestMethod.POST)
public Result taskExamPageList(@RequestBody @Validated(Add.class) ExamPaperForm form) {
if (!StringUtils.isBlank(form.getVisibility())) {
@@ -57,18 +49,16 @@
}
form.setCreateUser(getCurrentUser().getId());
form.setCreateTime(new Date());
- examPaperService.addPaper(form);
- return Result.ok();
- }
+ return examPaperService.addPaper(form);
+ }
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public Result edit(@RequestBody @Validated(Update.class) ExamPaperForm form) {
if (!StringUtils.isBlank(form.getVisibility())) {
form.setVisibility(VisibilityEnum.fromCode(form.getVisibility()).getName());
}
- examPaperService.updateExamPaper(form);
- return Result.ok();
+ return examPaperService.updateExamPaper(form);
}
@RequestMapping(value = "/editQuestion", method = RequestMethod.POST)
--
Gitblit v1.8.0