From 33a072160eda4fa7cb22d330c2bfa9048ad6c0e9 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 22 Jul 2021 14:11:50 +0800
Subject: [PATCH] 派遣记录接口修改
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 2eff8a8..e13248c 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -28,11 +28,16 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.service.ExamPaperService;
+import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
import org.springblade.modules.exam.vo.ExamPaperVO;
+import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.exam.wrapper.ExamPaperWrapper;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -46,6 +51,7 @@
public class ExamPaperController extends BladeController {
private final ExamPaperService examPaperService;
+
/**
* 详情
@@ -67,6 +73,15 @@
public R<IPage<ExamPaperVO>> list(@ApiIgnore @RequestParam Map<String, Object> exam, Query query) {
IPage<ExamPaper> pages = examPaperService.page(Condition.getPage(query), Condition.getQueryWrapper(exam, ExamPaper.class));
return R.data(ExamPaperWrapper.build().pageVO(pages));
+ }
+
+ /**
+ * 分页
+ */
+ @GetMapping("/pages")
+ public R<IPage<ExamPaperVO>> page(ExamPaperVO exam, Query query) {
+ IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), exam);
+ return R.data(pages);
}
@@ -128,9 +143,41 @@
@GetMapping("/queryPagerSubject")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "考试题目绑定", notes = "传入exam")
- public R<ExamPaperVO> queryPagerSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
- ExamPaperVO subject = examPaperService.queryPagerSubject(exam);
+ public R<ExamPaperSubjectVO> queryPagerSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
+ ExamPaperSubjectVO subject = examPaperService.queryPagerSubject(exam);
return R.data(subject);
}
+ /**
+ * 返回当前时间
+ */
+ @GetMapping("/getdate")
+ @ApiOperationSupport(order = 9)
+ public R getdate() {
+ Date date = new Date();
+ String strDateFormat = "yyyy-MM-dd HH:mm:ss";
+ SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
+ System.out.println(sdf.format(date));
+ return R.data(sdf.format(date));
+ }
+
+ /**
+ * 自定义树
+ * @param examPaper
+ * @return
+ */
+ @GetMapping("/page-tree")
+ public R pageTree(ExamPaper examPaper) {
+ List<ExamPaper> pages = examPaperService.selectExamPaperPageTree(examPaper);
+ return R.data(pages);
+ }
+
+ /**
+ * 解除绑定
+ */
+ @GetMapping("/UnbindSubject")
+ public R UnbindSubject(String paperid,String subjectid){
+
+ return R.status(examPaperService.UnbindSubject(paperid,subjectid));
+ }
}
--
Gitblit v1.9.3