From 9f97dd981d5d31bfab85b14efa6c23873b4ca882 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 16:27:37 +0800 Subject: [PATCH 1/8] =?UTF-8?q?feat:=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/system/system/SysDeptController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDeptController.java index e47bdf6..34a4e5a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/system/SysDeptController.java @@ -188,7 +188,7 @@ public class SysDeptController extends BaseController @ApiOperation("查询下级") @GetMapping("/detpList") @ResponseBody - public AjaxResult getDeptBydeptId(@RequestParam(required = false) Long deptId) { + public AjaxResult getDeptById(@RequestParam(required = false) Long deptId) { return success(deptService.getDeptBydeptId(Objects.nonNull(deptId) ? deptId : 0)); } } From 1a26433c5fab6aafcb9b8650fdfd06e741888943 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 16:47:55 +0800 Subject: [PATCH 2/8] =?UTF-8?q?feat:=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/elExam/onlineExam/onlineExam.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/onlineExam/onlineExam.html b/ruoyi-admin/src/main/resources/templates/system/elExam/onlineExam/onlineExam.html index 4aa0a8c..9e3e424 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/onlineExam/onlineExam.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/onlineExam/onlineExam.html @@ -59,6 +59,18 @@ return $.table.selectDictLabel(types, value); } }, + { + field: 'timeLimit', + title: '是否限时', + align: 'center', + formatter: function(value, row, index) { + if(value=='1'){ + return '限时'; + }else{ + return '不限时'; + } + } + }, { field: 'totalTime', title: '考试时长', From 8a28a5893d81c228874b4637621354010c4bcfc3 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 16:58:05 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:=E8=80=83=E8=AF=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/web/controller/exam/UserExamController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java index aeff25e..03aec79 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java @@ -8,7 +8,9 @@ import com.ruoyi.system.domain.userexam.dto.response.UserExamRespDTO; import com.ruoyi.web.controller.manager.UserExamManager; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; @@ -34,6 +36,15 @@ public class UserExamController extends BaseController { private UserExamManager userExamManager; + private String prefix = "system/elExam/userExam"; + + @ApiOperation("考试详情") + @GetMapping() + public String userExam() { + return prefix + "/userExam"; + } + + @ApiOperation("考试详情") @PostMapping("/list") @ResponseBody From 5c4da3771e7f44c6b5a71221e1206ba1448e5671 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 16:59:03 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:=E8=80=83=E8=AF=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/web/controller/exam/UserExamController.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java index 03aec79..4e31e27 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java @@ -2,13 +2,11 @@ package com.ruoyi.web.controller.exam; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.exam.dto.ExamDTO; import com.ruoyi.system.domain.userexam.dto.request.UserExamReqDTO; import com.ruoyi.system.domain.userexam.dto.response.UserExamRespDTO; import com.ruoyi.web.controller.manager.UserExamManager; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; From e9cc876e684383344cac5ef232a542b85f3400da Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 17:00:16 +0800 Subject: [PATCH 5/8] =?UTF-8?q?feat:=E8=80=83=E8=AF=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/web/controller/exam/ExamController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/ExamController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/ExamController.java index 151ce6d..e3d018b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/ExamController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/ExamController.java @@ -121,7 +121,7 @@ public class ExamController extends BaseController { @PostMapping("/changeStatus") @ResponseBody public AjaxResult changeStatus(ExamDTO examDTO) { - return success(examManager.changeStatus(examDTO)); + return toAjax(examManager.changeStatus(examDTO)); } From 305fc3c8f4294fe2d55e4a4503bbd8a6aea31bd4 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 17:05:53 +0800 Subject: [PATCH 6/8] =?UTF-8?q?feat:=E8=80=83=E8=AF=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/web/controller/manager/PaperManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java index e28396c..05629c2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java @@ -272,7 +272,6 @@ public class PaperManager { for (ElPaperQu item : quList) { item.setPaperId(paperId); item.setSort(sort); - item.setId(IdWorker.getIdStr()); //回答列表 QueryWrapper wrapper = new QueryWrapper<>(); wrapper.lambda().eq(ElQuAnswer::getQuId, item.getQuId()); From eee6e39bab31210c35e9f6ba4eed8c9a527f71cc Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 17:06:42 +0800 Subject: [PATCH 7/8] =?UTF-8?q?feat:=E8=80=83=E8=AF=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/web/controller/manager/PaperManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java index 05629c2..07f0281 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/PaperManager.java @@ -281,7 +281,6 @@ public class PaperManager { int ii = 0; for (ElQuAnswer answer : answerList) { ElPaperQuAnswer paperQuAnswer = new ElPaperQuAnswer(); - paperQuAnswer.setId(UUID.randomUUID().toString()); paperQuAnswer.setPaperId(paperId); paperQuAnswer.setQuId(answer.getQuId()); paperQuAnswer.setAnswerId(answer.getId()); From ba5745bcd3802f3a539a9b9a6611743c8fa02a99 Mon Sep 17 00:00:00 2001 From: wangxy <1356089412@qq.com> Date: Wed, 3 Jul 2024 17:29:12 +0800 Subject: [PATCH 8/8] =?UTF-8?q?feat:=E8=80=83=E8=AF=95=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/system/domain/exam/dto/ext/ExamRepoExtDTO.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/exam/dto/ext/ExamRepoExtDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/exam/dto/ext/ExamRepoExtDTO.java index 2bfd98d..5052b41 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/exam/dto/ext/ExamRepoExtDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/exam/dto/ext/ExamRepoExtDTO.java @@ -19,13 +19,13 @@ public class ExamRepoExtDTO extends ExamRepoDTO { private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "单选题总量", required=true) + @ApiModelProperty(value = "单选题总量") private Integer totalRadio; - @ApiModelProperty(value = "多选题总量", required=true) + @ApiModelProperty(value = "多选题总量") private Integer totalMulti; - @ApiModelProperty(value = "判断题总量", required=true) + @ApiModelProperty(value = "判断题总量") private Integer totalJudge; }