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/EntTestMemberController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java b/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java
index d435946..51373fd 100644
--- a/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java
+++ b/src/main/java/com/ots/project/exam/controller/EntTestMemberController.java
@@ -1,6 +1,7 @@
package com.ots.project.exam.controller;
import com.ots.common.constant.UserConstants;
import com.ots.common.enums.SenderType;
+import com.ots.common.enums.TestMemberStatusEnum;
import com.ots.common.enums.TestPackageStatusEnum;
import com.ots.common.enums.UserTypeEnum;
import com.ots.common.utils.MessageUtils;
@@ -31,6 +32,7 @@
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
+import static com.ots.common.enums.TestMemberStatusEnum.*;
import static com.ots.common.enums.UserTypeEnum.SYS_USER;
@Controller
@@ -137,6 +139,20 @@
if (!SYS_USER.getUserType().equals(sysUser.getUserType())) {
entTestMember.setUserId(sysUser.getUserId());
}
+ List<String> recyclingStatus = Arrays.asList( TestMemberStatusEnum.completed.getCode(), timeOut.getCode());
+ entTestMember.setStatusList(recyclingStatus);
+ return getDataTable(entTestMemberService.selectEntTestMemberTopList(entTestMember));
+ }
+ @PostMapping("/listTopAnswering2")
+ @ResponseBody
+ public TableDataInfo listTopAnswering2(EntTestMember entTestMember) {
+ startPage();
+ User sysUser = ShiroUtils.getSysUser();
+ if (!SYS_USER.getUserType().equals(sysUser.getUserType())) {
+ entTestMember.setUserId(sysUser.getUserId());
+ }
+ List<String> recyclingStatus = Arrays.asList( answering.getCode());
+ entTestMember.setStatusList(recyclingStatus);
return getDataTable(entTestMemberService.selectEntTestMemberTopList(entTestMember));
}
@PostMapping("/queryList")
--
Gitblit v1.9.1