From 9a391915a425121d87592f23aac7751e5d847f27 Mon Sep 17 00:00:00 2001
From: linzhijie <19970921lzj>
Date: 星期三, 24 三月 2021 19:24:45 +0800
Subject: [PATCH] 去除泰国接口调用
---
src/main/java/com/ots/project/exam/controller/EntTestDetailController.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 cb97ecb..b1d8521 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestDetailController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestDetailController.java
@@ -1,4 +1,5 @@
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;
@@ -17,19 +18,28 @@
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));
@@ -38,8 +48,11 @@
mmap.put("entTestDetail", entTestDetail);
return prefix + "/entTestDetail";
}
-
+ /**
+ * 鏌ヨentTestDetail鍒楄〃
+ */
+// @RequiresPermissions("exam:entTestDetail:list")
@PostMapping("/list")
@ResponseBody
public TableDataInfo list(EntTestDetail entTestDetail) {
@@ -55,7 +68,8 @@
if (ExamUtil.isListEmpty(questionReportList)) {
continue;
}
-
+
+ // 閬嶅巻鍑烘瘡涓�涓猺eport
for (QuestionReport questionReport : questionReportList) {
EntTestDetail entTestDetailTemp = new EntTestDetail();
entTestDetailTemp.setPermanentId(questionReport.getPermanentId());
@@ -69,7 +83,7 @@
entTestDetailList.add(entTestDetailTemp);
}
}
-
+ //鎸夌収鑰楁椂闄嶅簭鎺掑垪 timeSpent
if (Objects.equals("TimeSpent",entTestDetail.getSortType())) {
Collections.sort(entTestDetailList, new TimeSpentComparator());
}else {
@@ -77,9 +91,14 @@
}
return getDataTable(entTestDetailList);
}
-
+
+
+ /**
+ * 鏂板entTestDetail
+ */
@GetMapping("/add")
public String add() {
return prefix + "/add";
}
+
}
--
Gitblit v1.9.1