错题

zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionErrorController.java

@@ -4,15 +4,15 @@ import com.miaxis.common.annotation.Log;
 import com.miaxis.common.constant.Constants;
 import com.miaxis.common.core.controller.BaseController;
 import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.core.page.ResponsePageInfo;
 import com.miaxis.common.enums.BusinessTypeEnum;
-import com.miaxis.common.utils.poi.ExcelUtil;
-
+import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.question.domain.QuestionError;
+import com.miaxis.question.dto.QuestionErrorDto;
 import com.miaxis.question.service.IQuestionErrorService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
@@ -35,31 +35,47 @@ public class QuestionErrorController extends BaseController{
      * 查询错题列表
      */
 //    @PreAuthorize("@ss.hasPermi('question:error:list')")
-    @GetMapping("/list")
+//    @GetMapping("/list")
+//    @ApiOperation("查询错题列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+//            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+//    })
+//    public ResponsePageInfo<QuestionError> list(@ModelAttribute QuestionError questionError){
+//        startPage();
+//        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+//        student.getId();
+//        List<QuestionError> list = questionErrorService.selectQuestionErrorList(questionError);
+//        return toResponsePageInfo(list);
+//    }
+
+
+    @GetMapping("/getQuestionErrorList")
     @ApiOperation("查询错题列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
             @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
     })
-    public ResponsePageInfo<QuestionError> list(@ModelAttribute QuestionError questionError){
+    public ResponsePageInfo<QuestionError> getQuestionErrorList(@ModelAttribute QuestionErrorDto questionErrorDto){
         startPage();
-        List<QuestionError> list = questionErrorService.selectQuestionErrorList(questionError);
+        UserInfo student = SecurityUtils.getLoginUser().getStudent();
+        questionErrorDto.setUserId(student.getId());
+        List<QuestionError> list = questionErrorService.getQuestionErrorList(questionErrorDto);
         return toResponsePageInfo(list);
     }
 
-
     /**
      * 获取错题详细信息
      */
     //@PreAuthorize("@ss.hasPermi('question:error:query')")
-    @GetMapping(value = "/{id}")
-    @ApiOperation("获取错题详细信息")
-    public Response<QuestionError> getInfo(
-            @ApiParam(name = "id", value = "错题参数", required = true)
-            @PathVariable("id") Long id
-    ){
-        return Response.success(questionErrorService.getById(id));
-    }
+//    @GetMapping(value = "/{id}")
+//    @ApiOperation("获取错题详细信息")
+//    public Response<QuestionError> getInfo(
+//            @ApiParam(name = "id", value = "错题参数", required = true)
+//            @PathVariable("id") Long id
+//    ){
+//        return Response.success(questionErrorService.getById(id));
+//    }
 
     /**
      * 新增错题
@@ -76,12 +92,12 @@ public class QuestionErrorController extends BaseController{
      * 修改错题
      */
     //@PreAuthorize("@ss.hasPermi('question:error:edit')")
-    @Log(title = "错题", businessType = BusinessTypeEnum.UPDATE)
-    @PutMapping
-    @ApiOperation("修改错题")
-    public Response<Integer> edit(@RequestBody QuestionError questionError){
-        return toResponse(questionErrorService.updateById(questionError) ? 1 : 0);
-    }
+//    @Log(title = "错题", businessType = BusinessTypeEnum.UPDATE)
+//    @PutMapping
+//    @ApiOperation("修改错题")
+//    public Response<Integer> edit(@RequestBody QuestionError questionError){
+//        return toResponse(questionErrorService.updateById(questionError) ? 1 : 0);
+//    }
 
     /**
      * 删除错题

zzjs-admin/src/main/java/com/miaxis/app/controller/question/QuestionInfoController.java

@@ -35,17 +35,17 @@ public class QuestionInfoController extends BaseController{
      * 查询题库列表
      */
 //    @PreAuthorize("@ss.hasPermi('question:info:list')")
-    @GetMapping("/list")
-    @ApiOperation("查询题库列表")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
-            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
-    })
-    public ResponsePageInfo<QuestionInfo> list(@ModelAttribute QuestionInfo questionInfo){
-        startPage();
-        List<QuestionInfo> list = questionInfoService.selectQuestionInfoList(questionInfo);
-        return toResponsePageInfo(list);
-    }
+//    @GetMapping("/list")
+//    @ApiOperation("查询题库列表")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "pageNum",value = "当前页码" ,dataType = "int", paramType = "query", required = false),
+//            @ApiImplicitParam(name = "pageSize",value = "每页数据量" , dataType = "int", paramType = "query", required = false),
+//    })
+//    public ResponsePageInfo<QuestionInfo> list(@ModelAttribute QuestionInfo questionInfo){
+//        startPage();
+//        List<QuestionInfo> list = questionInfoService.selectQuestionInfoList(questionInfo);
+//        return toResponsePageInfo(list);
+//    }
 
     @GetMapping("/getQuestionInfoList")
     @ApiOperation("查询题库列表")

zzjs-service/src/main/java/com/miaxis/question/dto/QuestionErrorDto.java

@@ -0,0 +1,32 @@
+package com.miaxis.question.dto;
+
+import com.miaxis.common.core.domain.BaseBusinessEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 错题对象 question_error
+ *
+ * @author miaxis
+ * @date 2021-03-16
+ */
+@Data
+@ApiModel(value = "QuestionErrorDto", description = "错题对象 question_error")
+public class QuestionErrorDto extends BaseBusinessEntity{
+    private static final long serialVersionUID = 1L;
+
+    /** 用户id */
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
+
+    /** 题目id */
+    @ApiModelProperty(value = "题目id")
+    private Long questionId;
+
+    /** 科目 */
+    @ApiModelProperty(value = "科目")
+    private Long kemu;
+
+
+}

zzjs-service/src/main/java/com/miaxis/question/mapper/QuestionErrorMapper.java

@@ -1,8 +1,11 @@
 package com.miaxis.question.mapper;
 
-import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.miaxis.question.domain.QuestionError;
+import com.miaxis.question.dto.QuestionErrorDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 错题Mapper接口
@@ -19,4 +22,5 @@ public interface QuestionErrorMapper extends BaseMapper<QuestionError> {
      */
     public List<QuestionError> selectQuestionErrorList(QuestionError questionError);
 
+    List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto);
 }

zzjs-service/src/main/java/com/miaxis/question/service/IQuestionErrorService.java

@@ -3,6 +3,7 @@ package com.miaxis.question.service;
 import java.util.List;
 import com.miaxis.question.domain.QuestionError;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.miaxis.question.dto.QuestionErrorDto;
 
 /**
  * 错题Service接口
@@ -18,4 +19,6 @@ public interface IQuestionErrorService extends IService<QuestionError>{
      * @return 错题集合
      */
     public List<QuestionError> selectQuestionErrorList(QuestionError questionError);
+
+    public List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto);
 }

zzjs-service/src/main/java/com/miaxis/question/service/impl/QuestionErrorServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.miaxis.common.utils.DateUtils;
+import com.miaxis.question.dto.QuestionErrorDto;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.apache.commons.lang3.StringUtils;
@@ -33,4 +34,9 @@ public class QuestionErrorServiceImpl extends ServiceImpl<QuestionErrorMapper, Q
     public List<QuestionError> selectQuestionErrorList(QuestionError questionError){
         return questionErrorMapper.selectQuestionErrorList(questionError);
     }
+
+    @Override
+    public List<QuestionError> getQuestionErrorList(QuestionErrorDto questionErrorDto) {
+        return questionErrorMapper.getQuestionErrorList(questionErrorDto);
+    }
 }

zzjs-service/src/main/resources/mapper/question/QuestionErrorMapper.xml

@@ -24,4 +24,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+
+    <select id="getQuestionErrorList" parameterType="com.miaxis.question.dto.QuestionErrorDto" resultType="com.miaxis.question.vo.QuestionInfoVo">
+        select qi.id,type,
+        question, an1,
+        an2, an3,
+        an4,
+        an5,
+        an6,
+        an7,
+        answer_true,
+        explain1,
+        best_answer_id,
+        kemu,
+        sinaimg,
+        video_url,
+        cityid,
+        media_url,
+        show_option_type
+        from question_info qi
+        JOIN question_error qe
+        ON qi.id = qe.question_id
+        <where>
+            <if test="userId != null"> and qe.user_id = #{userId} </if>
+            <if test="questionId != null "> and question_id = #{questionId}</if>
+            <if test="kemu != null "> and kemu = #{kemu}</if>
+        </where>
+    </select>
+
+
 </mapper>

zzjs-service/src/main/resources/mapper/question/QuestionInfoMapper.xml

@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getQuestionInfoList" parameterType="com.miaxis.question.dto.QuestionInfoDto" resultType="com.miaxis.question.vo.QuestionInfoVo">
-        select id, type, question, an1, an2, an3, an4, an5, an6, an7, answer_true, explain1, best_answer_id, kemu, chapterid, sinaimg, video_url, cityid, media_url, show_option_type from question_info
+        select id, type, question, an1, an2, an3, an4, an5, an6, an7, answer_true, explain1, best_answer_id, kemu, sinaimg, video_url, cityid, media_url, show_option_type from question_info
         <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="type != null "> and type = #{type}</if>