From 17db5a8fba63b826aac71a2efb5271a98c6f2af1 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Mon, 28 Jan 2019 00:15:23 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 2da0a0b01d23595b465a03306029ab98e1a2ad5e.

# Conflicts:
#	ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
#	ruoyi-cms/src/main/resources/templates/web/user/set.html
---
 .../cms/controller/CmsUserController.java     | 48 +++++++++++++++++--
 .../resources/templates/web/user/set.html     |  6 +++
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
index cde2c879f..23fac7b7a 100644
--- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
+++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsUserController.java
@@ -1,14 +1,13 @@
 package com.ruoyi.cms.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.base.AjaxResult;
 import com.ruoyi.exam.domain.*;
 import cn.hutool.extra.servlet.ServletUtil;
 import com.ruoyi.exam.domain.ExamPractice;
 import com.ruoyi.exam.domain.ExamUserErrorQuestion;
 import com.ruoyi.exam.domain.ExamUserErrorQuestionVO;
-import com.ruoyi.exam.service.IExamPracticeService;
-import com.ruoyi.exam.service.IExamUserCollectionQuestionService;
-import com.ruoyi.exam.service.IExamUserErrorQuestionService;
+import com.ruoyi.exam.service.*;
 import com.ruoyi.framework.jwt.JwtUtil;
 import com.ruoyi.framework.web.util.ServletUtils;
 import com.ruoyi.framework.web.util.ShiroUtils;
@@ -20,6 +19,8 @@ import com.ruoyi.train.course.domain.TrainCourseVO;
 import com.ruoyi.train.course.service.ITrainCourseCategoryService;
 import com.ruoyi.train.course.service.ITrainCourseSectionService;
 import com.ruoyi.train.course.service.ITrainCourseService;
+import com.ruoyi.vip.domain.vo.VipUserOrdersVO;
+import com.ruoyi.vip.service.IVipUserOrdersService;
 import org.apache.shiro.web.servlet.SimpleCookie;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+import sun.awt.image.IntegerComponentRaster;
 
 import javax.servlet.http.Cookie;
 import java.util.List;
@@ -56,6 +58,9 @@ public class CmsUserController {
     @Autowired
     private IExamUserCollectionQuestionService examUserCollectionQuestionService;
 
+    @Autowired
+    private IExamUserExaminationService examUserExaminationService;
+
 
 
     @RequestMapping("/user/login.html")
@@ -75,7 +80,7 @@ public class CmsUserController {
     @RequestMapping("/user/index.html")
     public String webUserIndex(ModelMap map) {
         map.put( "user", ShiroUtils.getSysUser() );
-        return prefix + "/user/index";
+        return prefix + "/user/set";
     }
     @RequestMapping("/user/home.html")
     public String webUserHome(ModelMap map) {
@@ -159,4 +164,39 @@ public class CmsUserController {
         AjaxResult success = AjaxResult.success("删除成功");
         return success;
     }
+
+    @RequestMapping("/user/userexamination.html")
+    public String userExamquestion(ModelMap map) {
+        map.put( "user", ShiroUtils.getSysUser() );
+        return prefix + "/user/userexamination";
+    }
+
+
+    /**
+     * 我的考试记录
+     * @return
+     */
+    @RequestMapping("/user/myuserexamination/list")
+    @ResponseBody
+    public AjaxResult userExamquestionList() {
+        ExamUserExaminationVO examUserExamination = new ExamUserExaminationVO();
+        examUserExamination.setVipUserId(ShiroUtils.getUserId().intValue());
+        List<ExamUserExaminationVO> list = examUserExaminationService.selectMyExamUserExamination(examUserExamination);
+        AjaxResult success = AjaxResult.success("查询成功");
+        success.put("total",new PageInfo(list).getTotal());
+        success.put( "data", list );
+        return success;
+    }
+
+
+
+    @RequestMapping("/user/myuserexamination/detail/{id}")
+    public String userExamquestion(@PathVariable Integer id, ModelMap map) {
+
+        map.put( "user", ShiroUtils.getSysUser() );
+        ExamUserExaminationVO data = examUserExaminationService.selectDetailById( id );
+        map.put( "data", data );
+        return prefix + "/user/userexamination_detail";
+    }
+
 }
diff --git a/ruoyi-cms/src/main/resources/templates/web/user/set.html b/ruoyi-cms/src/main/resources/templates/web/user/set.html
index b76f25c5d..250fed0e5 100644
--- a/ruoyi-cms/src/main/resources/templates/web/user/set.html
+++ b/ruoyi-cms/src/main/resources/templates/web/user/set.html
@@ -46,6 +46,12 @@
         我的收藏
       </a>
     </li>
+    <li class="layui-nav-item" id="userexamination">
+      <a th:href="@{/web/user/userexamination.html}">
+        <i class="layui-icon">&#xe600;</i>
+        考试记录
+      </a>
+    </li>
   </ul>
 
   <div class="site-tree-mobile layui-hide">