From 05b007dc6a3267e59d9ea89997d270ba6bee245a Mon Sep 17 00:00:00 2001 From: flower Date: Sun, 27 Jan 2019 22:45:23 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=80=83=E8=AF=95?= =?UTF-8?q?=E8=AE=B0=E5=BD=95,=E8=80=83=E8=AF=95=E4=BA=A4=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CmsExaminationController.java | 19 ++++- .../cms/controller/CmsUserController.java | 46 ++++++++++- .../templates/web/examination/detail.html | 26 +++++-- .../templates/web/examination/list.html | 10 +++ .../resources/templates/web/user/set.html | 6 ++ .../controller/ApiExaminationController.java | 64 +++++++-------- .../exam/service/IExamExaminationService.java | 5 ++ .../impl/ExamExaminationServiceImpl.java | 78 +++++++++++++++++++ .../mapper/exam/ExamUserExaminationMapper.xml | 10 ++- 9 files changed, 215 insertions(+), 49 deletions(-) diff --git a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java index 6d0514cc5..74735b38b 100644 --- a/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java +++ b/ruoyi-cms/src/main/java/com/ruoyi/cms/controller/CmsExaminationController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.ruoyi.common.base.AjaxResult; import com.ruoyi.exam.domain.*; import com.ruoyi.exam.service.*; +import com.ruoyi.exam.service.impl.ExamExaminationServiceImpl; import com.ruoyi.framework.jwt.JwtUtil; import com.ruoyi.framework.web.exception.base.BaseException; import com.ruoyi.framework.web.util.ShiroUtils; @@ -12,10 +13,7 @@ import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -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.bind.annotation.*; import java.util.*; @@ -145,5 +143,18 @@ public class CmsExaminationController { return prefix+"detail"; } + @RequestMapping("/examination/finish/{examUserExaminationId}/{examinationId}/{paperId}") + @ResponseBody + public AjaxResult finish(@RequestBody List examUserExaminationQuestion, + @PathVariable Integer examUserExaminationId, @PathVariable Integer examinationId, @PathVariable Integer paperId,ModelMap map) { + SysUser sysUser = ShiroUtils.getSysUser(); + //交卷然后返回考试记录id + Integer id = examExaminationService.finshExamination(examUserExaminationQuestion,sysUser,examUserExaminationId,examinationId,paperId); + ExamUserExaminationVO data = examUserExaminationService.selectDetailById( id ); + AjaxResult success = AjaxResult.success( "报名成功" ); + success.put("id",id); + return success; + } + } 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..7d391fce0 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; @@ -31,6 +30,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 +56,9 @@ public class CmsUserController { @Autowired private IExamUserCollectionQuestionService examUserCollectionQuestionService; + @Autowired + private IExamUserExaminationService examUserExaminationService; + @RequestMapping("/user/login.html") @@ -75,7 +78,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 +162,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 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/examination/detail.html b/ruoyi-cms/src/main/resources/templates/web/examination/detail.html index 1eb069733..1a48dd55b 100644 --- a/ruoyi-cms/src/main/resources/templates/web/examination/detail.html +++ b/ruoyi-cms/src/main/resources/templates/web/examination/detail.html @@ -14,12 +14,14 @@
-
+
- [[${examExamination.name}]] + [[${examExamination.name}]]
+
+
[[${questionStat.index+1}]]: (单选) @@ -47,15 +49,14 @@
-
- -
+
+
@@ -84,18 +85,29 @@ document.write(unescape("%3Cspan id='cnzz_stat_icon_30088308'%3E%3C/span%3E%3Csc function endPaper() { var data = []; $(".question").each(function(){ + var examQuestionId = $(this).find(".questionId").eq(0).val() + var userAnswer = ""; + $(this).find("."+examQuestionId+"useranswer:checked").each(function(){ + userAnswer+=$(this).val()+","; + }) + userAnswer = userAnswer.substring(0,userAnswer.length-1) + data.push({examQuestionId:examQuestionId,userAnswer:userAnswer}) }) $.ajax({ type: 'post', - url: "/api/v1/examination/finish/"+[[${examUserExaminationId}]]+"/"+[[${examExamination.id}]]+"/"+[[${paperId}]], + url: "/web/examination/finish/"+[[${examUserExaminationId}]]+"/"+[[${examExamination.id}]]+"/"+[[${paperId}]], contentType: "application/json", data: JSON.stringify(data), success: function (result) { if (result.code != web_status.SUCCESS) { - $.modal.msgError(result.msg); + layer.msg(result.msg, {icon: 2}) + }else{ + layer.msg("已交卷", {icon: 1}) + location.href="/web/user/myuserexamination/detail/"+result.id; } } + }); } diff --git a/ruoyi-cms/src/main/resources/templates/web/examination/list.html b/ruoyi-cms/src/main/resources/templates/web/examination/list.html index c7f9981b1..c10722104 100644 --- a/ruoyi-cms/src/main/resources/templates/web/examination/list.html +++ b/ruoyi-cms/src/main/resources/templates/web/examination/list.html @@ -40,6 +40,14 @@ + +
@@ -84,6 +92,7 @@ document.write(unescape("%3Cspan id='cnzz_stat_icon_30088308'%3E%3C/span%3E%3Csc {checkbox: true} , {field: 'name', title: '考试名称'} , {field: 'trainCourseName', title: '课程名称'} + ,{field: 'type', title: '考试类型',templet: '#type'} , {field: 'timeLength', title: '考试时长'} , {field: 'passMark', title: '及格分数'} , {title: '操作', toolbar: '#barDemo'} @@ -162,6 +171,7 @@ document.write(unescape("%3Cspan id='cnzz_stat_icon_30088308'%3E%3C/span%3E%3Csc {checkbox: true} , {field: 'name', title: '考试名称'} , {field: 'trainCourseName', title: '课程名称'} + ,{field: 'type', title: '考试类型',templet: '#type'} , {field: 'timeLength', title: '考试时长'} , {field: 'passMark', title: '及格分数'} , {title: '操作', toolbar: '#signup'} 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 @@ 我的收藏 +
  • + + + 考试记录 + +
    • diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java index ab8bba725..35c967ebd 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiExaminationController.java @@ -261,13 +261,13 @@ public class ApiExaminationController extends BaseController { //如果是模拟考试，考试记录新增数据 if (examUserExaminationId == -1) { ExamUserExamination insert = new ExamUserExamination(); - insert.setExamExaminationId( examinationId ); - insert.setVipUserId( Integer.parseInt( userId.toString() ) ); - insert.setCreateDate( new Date() ); - insert.setExamPaperId( paperId ); - insert.setDelFlag( "0" ); - insert.setScore( 0 ); - examUserExaminationService.insertOne( insert ); + insert.setExamExaminationId(examinationId); + insert.setVipUserId(Integer.parseInt(userId.toString())); + insert.setCreateDate(new Date()); + insert.setExamPaperId(paperId); + insert.setDelFlag("0"); + insert.setScore(0); + examUserExaminationService.insertOne(insert); examUserExaminationId = insert.getId(); } @@ -276,39 +276,39 @@ public class ApiExaminationController extends BaseController { HashMap returnItem = new HashMap<>(); String userAnswer = item.getUserAnswer(); //存入用户回答 - if (StrUtil.isNotBlank( userAnswer )) { - returnItem.put( "userAnswer", userAnswer ); + if (StrUtil.isNotBlank(userAnswer)) { + returnItem.put("userAnswer", userAnswer); } Integer examQuestionId = item.getExamQuestionId(); - ExamQuestion examQuestion = examQuestionService.selectById( examQuestionId ); + ExamQuestion examQuestion = examQuestionService.selectById(examQuestionId); //存入正确答案 - if (StrUtil.isNotBlank( examQuestion.getAnswer() )) { - returnItem.put( "answer", examQuestion.getAnswer() ); + if (StrUtil.isNotBlank(examQuestion.getAnswer())) { + returnItem.put("answer", examQuestion.getAnswer()); } - returnItem.put( "title", examQuestion.getTitle() ); - returnItem.put( "rightWrong", "错误" ); - if (examQuestion.getAnswer().equals( userAnswer )) { + returnItem.put("title", examQuestion.getTitle()); + returnItem.put("rightWrong", "错误"); + if (examQuestion.getAnswer().equals(userAnswer)) { ExamPaperQuestion examPaperQuestion = new ExamPaperQuestion(); - examPaperQuestion.setExamPaperId( paperId ); - examPaperQuestion.setExamQuestionId( examQuestionId ); - score += examPaperQuestionService.selectExamPaperQuestionList( examPaperQuestion ).get( 0 ).getScore(); - returnItem.put( "rightWrong", "正确" ); + examPaperQuestion.setExamPaperId(paperId); + examPaperQuestion.setExamQuestionId(examQuestionId); + score += examPaperQuestionService.selectExamPaperQuestionList(examPaperQuestion).get(0).getScore(); + returnItem.put("rightWrong", "正确"); } - item.setExamUserExaminationId( examUserExaminationId ); - item.setCreateDate( new Date() ); - item.setCreateBy( user.getLoginName() ); - item.setDelFlag( "0" ); - item.setId( null ); - examUserExaminationQuestionService.insertOne( item ); - data.add( returnItem ); + item.setExamUserExaminationId(examUserExaminationId); + item.setCreateDate(new Date()); + item.setCreateBy(user.getLoginName()); + item.setDelFlag("0"); + item.setId(null); + examUserExaminationQuestionService.insertOne(item); + data.add(returnItem); } - ExamUserExamination examUserExamination = examUserExaminationService.selectById( examUserExaminationId ); - examUserExamination.setScore( score ); - examUserExamination.setUpdateDate( new Date() ); - examUserExamination.setCreateBy( user.getLoginName() ); - examUserExaminationService.updateOneSelectiveById( examUserExamination ); + ExamUserExamination examUserExamination = examUserExaminationService.selectById(examUserExaminationId); + examUserExamination.setScore(score); + examUserExamination.setUpdateDate(new Date()); + examUserExamination.setCreateBy(user.getLoginName()); + examUserExaminationService.updateOneSelectiveById(examUserExamination); - ExamExamination examExamination = examExaminationService.selectById( examinationId ); + ExamExamination examExamination = examExaminationService.selectById(examinationId); String finishedPaper = examExamination.getFinishedPaper(); diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java index add91e741..45bbfd13a 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/IExamExaminationService.java @@ -5,7 +5,10 @@ import java.util.List; import java.util.Map; import com.ruoyi.exam.domain.ExamQuestionVO; +import com.ruoyi.exam.domain.ExamUserExaminationQuestion; import com.ruoyi.framework.web.base.AbstractBaseService; +import com.ruoyi.system.domain.SysUser; + /** * 考试 服务层 * @@ -44,4 +47,6 @@ public interface IExamExaminationService extends AbstractBaseService selectEnterNameListFromWeb(Map map); List queryExaminationQuestion(ExamExamination examExamination,Integer examUserExaminationId); + + Integer finshExamination(List examUserExaminationQuestion, SysUser user, Integer examUserExaminationId, Integer examinationId, Integer paperId); } diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java index 4bc4d7691..9835b1d35 100644 --- a/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java +++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/service/impl/ExamExaminationServiceImpl.java @@ -2,6 +2,7 @@ package com.ruoyi.exam.service.impl; import java.util.*; +import cn.hutool.core.util.StrUtil; import com.ruoyi.exam.domain.*; import com.ruoyi.exam.service.*; import com.ruoyi.framework.web.exception.base.BaseException; @@ -9,6 +10,7 @@ import com.ruoyi.framework.web.util.ShiroUtils; import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.stereotype.Service; import com.ruoyi.exam.mapper.ExamExaminationMapper; import com.ruoyi.common.support.Convert; @@ -25,6 +27,9 @@ public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl examUserExaminationQuestion,SysUser user ,Integer examUserExaminationId, Integer examinationId, Integer paperId) { + + ArrayList> data = new ArrayList<>(); + Integer userId = user.getUserId().intValue(); + //如果是模拟考试，考试记录新增数据 + if (examUserExaminationId == -1) { + ExamUserExamination insert = new ExamUserExamination(); + insert.setExamExaminationId(examinationId); + insert.setVipUserId(Integer.parseInt(userId.toString())); + insert.setCreateDate(new Date()); + insert.setExamPaperId(paperId); + insert.setDelFlag("0"); + insert.setScore(0); + examUserExaminationService.insertOne(insert); + examUserExaminationId = insert.getId(); + } + + Integer score = 0; + for (ExamUserExaminationQuestion item : examUserExaminationQuestion) { + HashMap returnItem = new HashMap<>(); + String userAnswer = item.getUserAnswer(); + //存入用户回答 + if (StrUtil.isNotBlank(userAnswer)) { + returnItem.put("userAnswer", userAnswer); + } + Integer examQuestionId = item.getExamQuestionId(); + ExamQuestion examQuestion = examQuestionService.selectById(examQuestionId); + //存入正确答案 + if (StrUtil.isNotBlank(examQuestion.getAnswer())) { + returnItem.put("answer", examQuestion.getAnswer()); + } + returnItem.put("title", examQuestion.getTitle()); + returnItem.put("rightWrong", "错误"); + if (examQuestion.getAnswer().equals(userAnswer)) { + ExamPaperQuestion examPaperQuestion = new ExamPaperQuestion(); + examPaperQuestion.setExamPaperId(paperId); + examPaperQuestion.setExamQuestionId(examQuestionId); + score += examPaperQuestionService.selectExamPaperQuestionList(examPaperQuestion).get(0).getScore(); + returnItem.put("rightWrong", "正确"); + } + item.setExamUserExaminationId(examUserExaminationId); + item.setCreateDate(new Date()); + item.setCreateBy(user.getLoginName()); + item.setDelFlag("0"); + item.setId(null); + examUserExaminationQuestionService.insertOne(item); + data.add(returnItem); + } + ExamUserExamination examUserExamination = examUserExaminationService.selectById(examUserExaminationId); + examUserExamination.setScore(score); + examUserExamination.setUpdateDate(new Date()); + examUserExamination.setCreateBy(user.getLoginName()); + examUserExaminationService.updateOneSelectiveById(examUserExamination); + + return examUserExaminationId; + } + /** * 查询考试分页列表 * @@ -180,4 +255,7 @@ public class ExamExaminationServiceImpl extends AbstractBaseServiceImpl - + + + + From a9f8ee4104bc466a5aa2776748f4734f73aad4c5 Mon Sep 17 00:00:00 2001 From: flower Date: Sun, 27 Jan 2019 23:21:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=80=83=E8=AF=95?= =?UTF-8?q?=E8=AE=B0=E5=BD=95,=E8=80=83=E8=AF=95=E4=BA=A4=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/web/user/userexamination.html | 100 ++++++++++++++++++ .../web/user/userexamination_detail.html | 76 +++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 ruoyi-cms/src/main/resources/templates/web/user/userexamination.html create mode 100644 ruoyi-cms/src/main/resources/templates/web/user/userexamination_detail.html diff --git a/ruoyi-cms/src/main/resources/templates/web/user/userexamination.html b/ruoyi-cms/src/main/resources/templates/web/user/userexamination.html new file mode 100644 index 000000000..d06ff5eef --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/userexamination.html @@ -0,0 +1,100 @@ + + + + + + + +
    +
    + +
    +
    +
    + +
    +
    + 我的考试记录 +
    +
    + + + + + + + + + +
    +
    + + +
    +
    + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-cms/src/main/resources/templates/web/user/userexamination_detail.html b/ruoyi-cms/src/main/resources/templates/web/user/userexamination_detail.html new file mode 100644 index 000000000..753d2c7b4 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/userexamination_detail.html @@ -0,0 +1,76 @@ + + + + + + + +
    +
    + +
    +
    +
    + +
    +
    + 该试卷无法查看 +
    +
    + 得分:[[${data.score}]] +
    +
    +
    +

    [[${itemStat.index+1}]]:[[${item.title}]] + ✔️回答正确 + ✘回答错误 +

    + +
    +

    [[${qItem.number}]]:[[${qItem.content}]]

    +

    正确答案[[${item.answer}]]

    +
    +
    +
    + + + +
    +
    + + +
    +
    + + + + + + + + + + \ No newline at end of file From 2da0a0b01d23595b465a03306029ab98e1a2ad5e Mon Sep 17 00:00:00 2001 From: flower Date: Sun, 27 Jan 2019 23:27:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=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 --- ruoyi-cms/ruoyi-cms.iml | 169 ++++++++++++++++++ .../cms/controller/CmsUserController.java | 29 ++- .../resources/templates/web/user/orders.html | 92 ++++++++++ .../resources/templates/web/user/set.html | 6 + .../mapper/vip/VipUserOrdersMapper.xml | 1 + 5 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 ruoyi-cms/ruoyi-cms.iml create mode 100644 ruoyi-cms/src/main/resources/templates/web/user/orders.html diff --git a/ruoyi-cms/ruoyi-cms.iml b/ruoyi-cms/ruoyi-cms.iml new file mode 100644 index 000000000..42d762201 --- /dev/null +++ b/ruoyi-cms/ruoyi-cms.iml @@ -0,0 +1,169 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 7d391fce0..4423ca982 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 @@ -19,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; @@ -59,6 +61,9 @@ public class CmsUserController { @Autowired private IExamUserExaminationService examUserExaminationService; + @Autowired + private IVipUserOrdersService vipUserOrdersService; + @RequestMapping("/user/login.html") @@ -187,7 +192,12 @@ public class CmsUserController { } - + /** + * 考试记录详情 + * @param id + * @param map + * @return + */ @RequestMapping("/user/myuserexamination/detail/{id}") public String userExamquestion(@PathVariable Integer id, ModelMap map) { @@ -197,4 +207,21 @@ public class CmsUserController { return prefix + "/user/userexamination_detail"; } + @RequestMapping("/user/orders.html") + public String orders(ModelMap map) { + map.put( "user", ShiroUtils.getSysUser() ); + return prefix + "/user/orders"; + } + + @RequestMapping("/user/orders/list") + @ResponseBody + public AjaxResult orders(VipUserOrdersVO vipUserOrders) { + AjaxResult success = AjaxResult.success("插入成功"); + vipUserOrders.setVipUserId(ShiroUtils.getUserId().intValue()); + List list = vipUserOrdersService.selectVipUserOrdersPage(vipUserOrders); + success.put("total",new PageInfo(list).getTotal()); + success.put( "data", list ); + return success; + } + } diff --git a/ruoyi-cms/src/main/resources/templates/web/user/orders.html b/ruoyi-cms/src/main/resources/templates/web/user/orders.html new file mode 100644 index 000000000..6d81dfd87 --- /dev/null +++ b/ruoyi-cms/src/main/resources/templates/web/user/orders.html @@ -0,0 +1,92 @@ + + + + + + + +
    +
    + +
    +
    +
    + +
    +
    + 我的支付记录 +
    +
    + + + + + +
    +
    + + +
    +
    + + + + + + + + + + \ No newline at end of file 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 250fed0e5..41bb56225 100644 --- a/ruoyi-cms/src/main/resources/templates/web/user/set.html +++ b/ruoyi-cms/src/main/resources/templates/web/user/set.html @@ -52,6 +52,12 @@ 考试记录 +
  • + + + 支付记录 + +
    • diff --git a/ruoyi-vip/src/main/resources/mapper/vip/VipUserOrdersMapper.xml b/ruoyi-vip/src/main/resources/mapper/vip/VipUserOrdersMapper.xml index ece095110..36e715d1b 100644 --- a/ruoyi-vip/src/main/resources/mapper/vip/VipUserOrdersMapper.xml +++ b/ruoyi-vip/src/main/resources/mapper/vip/VipUserOrdersMapper.xml @@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" join train_course c on c.id=o.train_course_id and o.id = #{id} + and o.vip_user_id = #{vipUserId} and u.user_name like CONCAT('%',#{vipUserName},'%') and c.name like CONCAT('%',#{trainCourseName},'%') and o.del_flag = #{delFlag} From e51cf575ffb51a51c7b0f9e1f547d6a2b7dab8a5 Mon Sep 17 00:00:00 2001 From: zhujunjieit Date: Mon, 28 Jan 2019 00:33:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=96=87=E4=BB=B6ruoyi-c?= =?UTF-8?q?ms/ruoyi-cms.iml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-cms/ruoyi-cms.iml | 169 ---------------------------------------- 1 file changed, 169 deletions(-) delete mode 100644 ruoyi-cms/ruoyi-cms.iml diff --git a/ruoyi-cms/ruoyi-cms.iml b/ruoyi-cms/ruoyi-cms.iml deleted file mode 100644 index 42d762201..000000000 --- a/ruoyi-cms/ruoyi-cms.iml +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file