From 3a8e1524dcf0eeb610d38123d5f0a3ef838379cd Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期一, 12 四月 2021 15:44:53 +0800
Subject: [PATCH] Merge branch '20210406-maqv2' into 20210412-youhua
---
src/main/java/com/ots/project/exam/controller/EntTestDetailController.java | 29 +++++------------------------
1 files changed, 5 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/EntTestDetailController.java b/src/main/java/com/ots/project/exam/controller/EntTestDetailController.java
index b1d8521..cb97ecb 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestDetailController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestDetailController.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.controller;
-
import com.ots.common.enums.UserTypeEnum;
import com.ots.common.utils.security.ShiroUtils;
import com.ots.framework.web.controller.BaseController;
@@ -18,28 +17,19 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-/**
- * entTestDetailController
- *
- * @author ots
- * @date 2020-03-01
- */
@Controller
@RequestMapping("/exam/entTestDetail")
public class EntTestDetailController extends BaseController {
private String prefix = "exam/entTestDetail";
-
@Autowired
private ITExamReportService examReportService;
-
@GetMapping("/testDetail/{tokens}")
- // @RequiresPermissions("exam:entTestDetail:list")
+
public String entTestDetail(@PathVariable List<String> tokens, ModelMap mmap) {
EntTestDetail entTestDetail = new EntTestDetail();
entTestDetail.setToken(JsonUtil.toJsonStr(tokens));
@@ -48,11 +38,8 @@
mmap.put("entTestDetail", entTestDetail);
return prefix + "/entTestDetail";
}
+
- /**
- * 鏌ヨentTestDetail鍒楄〃
- */
-// @RequiresPermissions("exam:entTestDetail:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(EntTestDetail entTestDetail) {
@@ -68,8 +55,7 @@
if (ExamUtil.isListEmpty(questionReportList)) {
continue;
}
-
- // 閬嶅巻鍑烘瘡涓�涓猺eport
+
for (QuestionReport questionReport : questionReportList) {
EntTestDetail entTestDetailTemp = new EntTestDetail();
entTestDetailTemp.setPermanentId(questionReport.getPermanentId());
@@ -83,7 +69,7 @@
entTestDetailList.add(entTestDetailTemp);
}
}
- //鎸夌収鑰楁椂闄嶅簭鎺掑垪 timeSpent
+
if (Objects.equals("TimeSpent",entTestDetail.getSortType())) {
Collections.sort(entTestDetailList, new TimeSpentComparator());
}else {
@@ -91,14 +77,9 @@
}
return getDataTable(entTestDetailList);
}
-
-
- /**
- * 鏂板entTestDetail
- */
+
@GetMapping("/add")
public String add() {
return prefix + "/add";
}
-
}
--
Gitblit v1.9.1