From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目
---
src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 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 f7bf26d..8fb9cb8 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamSubjectChoicesController.java
@@ -4,16 +4,25 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.exam.entity.ExamSubjectChoices;
+import org.springblade.modules.exam.excel.ExamScoreExcel;
+import org.springblade.modules.exam.excel.ExamScoreImporter;
+import org.springblade.modules.exam.excel.ExamSubjectExcel;
+import org.springblade.modules.exam.excel.ExamSubjectImporter;
import org.springblade.modules.exam.service.ExamSubjectChoicesService;
import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @author zhongrj
@@ -58,6 +67,18 @@
@ApiOperation(value = "新增", notes = "传入examSubjectChoices")
public R save(@RequestBody ExamSubjectChoices examSubjectChoices) {
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));
}
/**
@@ -141,4 +162,27 @@
return R.status(examSubjectChoicesService.updateChoicesValue(id,value));
}
+ /**
+ * 导入题库
+ * @param isCovered 1 覆盖 0不覆盖
+ * @return
+ */
+ @PostMapping("import-examSubject")
+ @ApiOperation(value = "导入题库", notes = "传入excel")
+ public R importExamScore(MultipartFile file, Integer isCovered) {
+ ExamSubjectImporter examSubjectImporter = new ExamSubjectImporter(examSubjectChoicesService, false);
+ ExcelUtil.save(file, examSubjectImporter, ExamSubjectExcel.class);
+ return R.success("操作成功");
+ }
+
+ /**
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportUser(HttpServletResponse response) {
+ List<ExamSubjectExcel> list = new ArrayList<>();
+ ExcelUtil.export(response, "题库导入数据模板", "题库导入数据表", list, ExamSubjectExcel.class);
+ }
+
}
--
Gitblit v1.9.3