From 3eee859042cab129f6d264bd284c71c6c48c3c69 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Tue, 29 Jan 2019 00:09:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E8=80=83=E8=AF=95=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ApiUserCollectionQuestionController.java  | 19 ++++++++++++++-----
 .../ruoyi/exam/domain/ExamExaminationVO.java  |  1 +
 .../mapper/exam/ExamExaminationMapper.xml     |  3 ---
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java
index 2dc2701da..37605ee38 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/controller/ApiUserCollectionQuestionController.java
@@ -36,14 +36,23 @@ public class ApiUserCollectionQuestionController extends BaseController {
      * @param id
      * @return
      */
-    @PostMapping("/v1/question/collection/{id}")
+    @GetMapping("/v1/question/collection/{id}")
     public AjaxResult answer(@PathVariable("id") Integer id) {
 
         SysUser sysUser = sysUserService.selectUserByLoginName( JwtUtil.getLoginName() );
-
-        int insert = examUserCollectionQuestionService.insertSelectiveBySelf(id,sysUser);
-        AjaxResult success = success( "插入我的收藏记录成功" );
-        return success;
+        ExamUserCollectionQuestionVO examUserCollectionQuestionVO = new ExamUserCollectionQuestionVO();
+        examUserCollectionQuestionVO.setVipUserId( sysUser.getUserId().intValue() );
+        examUserCollectionQuestionVO.setExamQuestionId( id );
+        List<ExamUserCollectionQuestionVO> collectionQuestionVOList = examUserCollectionQuestionService.selectExamUserCollectionQuestionPage( examUserCollectionQuestionVO );
+        if (collectionQuestionVOList != null && collectionQuestionVOList.size() > 0) {
+            //删除收藏记录
+            examUserCollectionQuestionService.delete(examUserCollectionQuestionVO);
+            return success( "取消收藏成功" );
+        } else {
+            //插入收藏记录
+            int insert = examUserCollectionQuestionService.insertSelectiveBySelf( id, sysUser );
+            return success( "收藏成功" );
+        }
     }
 
     /**
diff --git a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java
index cc9c39a30..dbb1e4733 100644
--- a/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java
+++ b/ruoyi-exam/src/main/java/com/ruoyi/exam/domain/ExamExaminationVO.java
@@ -7,6 +7,7 @@ public class ExamExaminationVO extends ExamExamination {
 
     private String trainCourseName;
 
+    private String examExaminationUserId;
 
     public String getTrainCourseName() {
         return trainCourseName;
diff --git a/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml b/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml
index 73cc81b51..23cde84a4 100644
--- a/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml
+++ b/ruoyi-exam/src/main/resources/mapper/exam/ExamExaminationMapper.xml
@@ -118,10 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null  and remarks != '' "> and exam_examination.remarks = #{ination.remarks}</if>
             <if test="delFlag != null  and delFlag != '' "> and exam_examination.del_flag = #{ination.delFlag}</if>
         </where>
-
     </select>
-
-
     <select id="selectEnterNameListFromWeb" resultMap="ExamExaminationResult">
         select
         <include refid="selectExamExaminationVo"/>,tc.name as traincourse_name