From d933448be36d77173a9039fe0c8d210d4e76798c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sun, 18 Jul 2021 15:51:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 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 70592d3..3f9d10d 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -36,6 +36,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -150,4 +151,23 @@
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