Merge remote-tracking branch 'origin/new-exam' into new-exam

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));
     }
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserExamController.java

@@ -2,13 +2,13 @@ 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.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 +34,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

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<ElQuAnswer> wrapper = new QueryWrapper<>();
             wrapper.lambda().eq(ElQuAnswer::getQuId, item.getQuId());
@@ -282,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());

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));
     }
 }

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: '考试时长',

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;
     
 }