错题集搜素，学生靶向作业

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperStudentWebService.java

@@ -99,7 +99,7 @@ public class PaperStudentWebService {
 
                     //学生作业id
                     List<TPaperStudentQuestion> stuques = list.stream().filter(
-                            (pq) -> stuids.stream().collect(Collectors.toList()).contains(pq.getQuestionid())).collect(Collectors.toList());
+                            (pq) -> stuids.stream().collect(Collectors.toList()).contains(pq.getQuestionpid())).collect(Collectors.toList());
 
                     if(N_Utils.isListNotEmpty(stuques)) savelist.addAll(stuques);
                 }

sstudy/src/main/resources/mapper/paper/PaperAnalyzeMapper.xml

@@ -214,6 +214,8 @@
         ,psq.qorder,psq.qn,psq.psid
         ,q.questionid,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype,q.complexity,q.hashear,q.hearfile,q.qlevel,q.sorder
         ,ifnull(q.questionpid,q.questionid)questionpid
+        ,(case when psq.questionid!=psq.questionpid then '' else (select group_concat(p.pointname separator '  ')
+        from t_question_point qp left join t_point p on qp.pointid=p.pointid where qp.questionid=q.questionid) end)pointname
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         LEFT JOIN t_paper_qtype_question tq ON psq.questionid=tq.questionid AND psq.paperid=tq.paperid
         LEFT JOIN t_paper_qtype t ON tq.ptid=t.ptid
@@ -490,6 +492,8 @@
     <!--作业母题列表-->
     <select id="listQuestionByQuestionIds" resultType="com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo">
         select questionid,ctype,qstem,qoption,qanswer,qanalyze,q.hashear,q.hearfile,q.qlevel
+        ,(select group_concat(p.pointname separator '  ') from t_question_point qp
+        left join t_point p on qp.pointid=p.pointid where qp.questionid=q.questionid)pointname
         from t_question q where questionid in
         <foreach collection="questionids" item="questionid" open="(" separator="," close=")">
             #{questionid}

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

@@ -61,8 +61,8 @@
             and p.directorid=#{question.directorid}
         </if>
         <if test="question.qtypeid!=null and question.qtypeid!='0'.toString() and question.qtypeid!=''">
-            <if test="qs.qtypeid!='tlt'">and qs.hashear=0 and qs.qtypeid=#{qs.qtypeid}</if>
-            <if test="qs.qtypeid=='tlt'">and qs.hashear=1</if>
+            <if test="question.qtypeid!='tlt'">and qs.hashear=0 and qs.qtypeid=#{question.qtypeid}</if>
+            <if test="question.qtypeid=='tlt'">and qs.hashear=1</if>
         </if>
         group by qs.questionid,qs.qctype order by qs.handletime desc,qs.qorder desc
     </select>