Merge remote-tracking branch 'origin/master' into ywx

sstudy/src/main/java/com/xhkjedu/sstudy/controller/question/QuestionController.java

@@ -62,7 +62,7 @@ public class QuestionController {
         Integer pageSize = tQuestion.getPageSize();
         N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
         PageHelper.startPage(page, pageSize);
-        List<TQuestion> list = tQuestionService.findAll(tQuestion);
+        List<QuestionVo> list = tQuestionService.findAll(tQuestion);
         PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
         return new ResultVo(0,"获取列表成功",pageResult);
     }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/QuestionMapper.java

@@ -3,7 +3,6 @@ package com.xhkjedu.sstudy.mapper.question;
 import com.xhkjedu.sstudy.base.TkMapper;
 import com.xhkjedu.sstudy.model.question.TQuestion;
 import com.xhkjedu.sstudy.vo.question.QuestionVo;
-import com.xhkjedu.sstudy.vo.question.SelectQuestionVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -44,7 +43,7 @@ public interface QuestionMapper extends TkMapper<TQuestion> {
      * @Date 2020/6/9 8:48
      * @return java.util.List<com.xhkjedu.model.question.TQuestion>
      **/
-    List<TQuestion> findAll(@Param("question") TQuestion question);
+    List<QuestionVo> findAll(@Param("question") TQuestion question);
 
     /**
      * 更新单个试题状态

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionService.java

@@ -86,7 +86,7 @@ public class QuestionService {
     }
 
     //获取列表
-    public List <TQuestion> findAll(TQuestion question) {
+    public List <QuestionVo> findAll(TQuestion question) {
         return questionMapper.findAll(question);
     }
 

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -136,7 +136,7 @@
     <!--管理端试题列表-->
     <select id="findAll" resultType="com.xhkjedu.sstudy.vo.question.QuestionVo">
         select q.questionid,q.score,q.complexity,q.ctype,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.belong,q.createid
-        ,q.qtypeid,q.qtypename,q.createtime,q.count,q.qstate,q.source,q.year,q.region,q.schoolname,q.hearfile,q.qlevel
+        ,q.qtypeid,q.qtypename,q.createtime,q.count,q.qstate,q.source,q.year,q.region,q.schoolname,q.hashear,q.hearfile,q.qlevel
         from t_question q left join t_question_director qd on q.questionid=qd.questionid
         <if test="question.belong!=null and question.belong==5">
             left join t_question_collect qc on q.questionid = qc.questionid