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/MainIndexController.java | 33 ++++++---------------------------
1 files changed, 6 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/ots/project/exam/controller/MainIndexController.java b/src/main/java/com/ots/project/exam/controller/MainIndexController.java
index d7524da..f02e75f 100644
--- a/src/main/java/com/ots/project/exam/controller/MainIndexController.java
+++ b/src/main/java/com/ots/project/exam/controller/MainIndexController.java
@@ -1,5 +1,4 @@
package com.ots.project.exam.controller;
-
import com.ots.common.utils.security.ShiroUtils;
import com.ots.framework.web.controller.BaseController;
import com.ots.framework.web.page.TableDataInfo;
@@ -9,22 +8,12 @@
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-
import java.util.Objects;
-/**
- * 棣栭〉灞曠ず鍐呭
- */
@Controller
@RequestMapping("/mail/index")
public class MainIndexController extends BaseController {
-
- /**
- * 鏈�杩�50涓畬鎴愭祴璇曡褰�
- *
- * @param sysUserExtend
- * @return
- */
+
@PostMapping("/listCompleteTestRecord")
@ResponseBody
public TableDataInfo listCompleteTestRecord(SysUserExtend sysUserExtend) {
@@ -38,14 +27,10 @@
if (Objects.nonNull(sysUserExtend.getParentUserTempId())) {
sysUserExtend.setParentUserId(sysUserExtend.getParentUserTempId());
}
-// List<SysUserExtend> list = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
+
return getDataTable(null);
}
-
- /**
- * @param sysUserExtend
- * @return
- */
+
@PostMapping("/listAnsweringTestRecord")
@ResponseBody
public TableDataInfo listAnsweringTestRecord(SysUserExtend sysUserExtend) {
@@ -59,16 +44,10 @@
if (Objects.nonNull(sysUserExtend.getParentUserTempId())) {
sysUserExtend.setParentUserId(sysUserExtend.getParentUserTempId());
}
-// List<SysUserExtend> list = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
+
return getDataTable(null);
}
-
- /**
- * 鏈�杩戝垱寤虹殑20涓祴璇曞寘
- *
- * @param sysUserExtend
- * @return
- */
+
@PostMapping("/listRecentlyCreatedTestPackage")
@ResponseBody
public TableDataInfo listRecentlyCreatedTestPackage(SysUserExtend sysUserExtend) {
@@ -82,7 +61,7 @@
if (Objects.nonNull(sysUserExtend.getParentUserTempId())) {
sysUserExtend.setParentUserId(sysUserExtend.getParentUserTempId());
}
-// List<SysUserExtend> list = sysUserExtendService.selectSysUserExtendList(sysUserExtend);
+
return getDataTable(null);
}
}
--
Gitblit v1.9.1