From 60f3b50baef73b3c8d928c7059632f8df892fafc Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 05 Aug 2021 15:42:54 +0800
Subject: [PATCH] 1.单位信息

---
 src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
index 4e81d4a..99d9a90 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
@@ -12,6 +12,7 @@
 import org.springblade.modules.exam.service.ExamSubjectChoicesService;
 import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
 import org.springframework.web.bind.annotation.*;
+
 import java.util.Date;
 
 /**
@@ -28,7 +29,8 @@
 
 	/**
 	 * 自定义分页
-	 * @param query page,size
+	 *
+	 * @param query              page,size
 	 * @param examSubjectChoices 选择题信息对象
 	 */
 	@GetMapping("/page")
@@ -38,7 +40,18 @@
 	}
 
 	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	public R<IPage<ExamSubjectChoices>> list(ExamSubjectChoices examSubjectChoices, Query query) {
+		IPage<ExamSubjectChoices> pages = examSubjectChoicesService.page(Condition.getPage(query), Condition.getQueryWrapper(examSubjectChoices));
+		return R.data(pages);
+	}
+
+
+	/**
 	 * 新增
+	 *
 	 * @param examSubjectChoices 选择题信息对象
 	 */
 	@PostMapping("/save")
@@ -47,8 +60,21 @@
 		return R.status(examSubjectChoicesService.save(examSubjectChoices));
 	}
 
+
+	/**
+	 * 新增题目及选项信息
+	 *
+	 * @param examSubjectChoices 题目信息对象
+	 */
+	@PostMapping("/saveSubjectChoicesAndOption")
+	@ApiOperation(value = "新增", notes = "传入examSubjectChoices")
+	public R saveSubjectChoicesAndOption(@RequestBody ExamSubjectChoicesVO examSubjectChoices) {
+		return R.status(examSubjectChoicesService.saveSubjectChoicesAndOption(examSubjectChoices));
+	}
+
 	/**
 	 * 修改
+	 *
 	 * @param examSubjectChoices 选择题信息对象
 	 */
 	@PostMapping("/update")
@@ -58,13 +84,14 @@
 
 	/**
 	 * 新增或修改
+	 *
 	 * @param examSubjectChoices 选择题信息对象
 	 */
 	@PostMapping("/submit")
 	public R submit(@RequestBody ExamSubjectChoices examSubjectChoices) {
-		if (null!=examSubjectChoices.getId()){
+		if (null != examSubjectChoices.getId()) {
 			examSubjectChoices.setCreateDate(new Date());
-		}else {
+		} else {
 			examSubjectChoices.setModifyDate(new Date());
 		}
 		return R.status(examSubjectChoicesService.saveOrUpdate(examSubjectChoices));
@@ -72,6 +99,7 @@
 
 	/**
 	 * 删除
+	 *
 	 * @param ids 选择题信息ids 数组
 	 */
 	@PostMapping("/remove")
@@ -81,15 +109,48 @@
 
 	/**
 	 * 详情
+	 *
 	 * @param examSubjectChoices 选择题信息对象
 	 */
 	@GetMapping("/detail")
 	@ApiOperation(value = "详情", notes = "传入examSubjectChoices")
-	public R<ExamSubjectChoicesVO> detail(ExamSubjectChoices examSubjectChoices) {
+	public R<ExamSubjectChoices> detail(ExamSubjectChoices examSubjectChoices) {
+		//查询选择题详情
+		ExamSubjectChoices detail = examSubjectChoicesService.getOne(Condition.getQueryWrapper(examSubjectChoices));
+		//返回
+		return R.data(detail);
+	}
+
+
+	/**
+	 * 详情(包含选项信息)
+	 *
+	 * @param examSubjectChoices 选择题信息对象
+	 */
+	@GetMapping("/details")
+	@ApiOperation(value = "详情", notes = "传入examSubjectChoices")
+	public R<ExamSubjectChoicesVO> details(ExamSubjectChoices examSubjectChoices) {
 		//查询选择题详情
 		ExamSubjectChoicesVO detail = examSubjectChoicesService.selectExamSubjectChoicesInfo(examSubjectChoices);
 		//返回
 		return R.data(detail);
 	}
 
+	/**
+	 * 查询试卷包含的题目
+	 */
+	@GetMapping("/getEexPaperChoices")
+	public R<IPage<ExamSubjectChoicesVO>> getEexPaperChoices(ExamSubjectChoicesVO examSubjectChoices, Query query) {
+		IPage<ExamSubjectChoicesVO> pages = examSubjectChoicesService.getEexPaperChoices(Condition.getPage(query), examSubjectChoices);
+		return R.data(pages);
+	}
+
+	/**
+	 * 修改单项题目分值
+	 */
+	@PostMapping("/updateChoicesValue")
+	public R updateChoicesValue(String id,String value) {
+		return R.status(examSubjectChoicesService.updateChoicesValue(id,value));
+	}
+
 }

--
Gitblit v1.9.3