Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -95,7 +95,7 @@
         left join t_paper_student_question psq on psq.psid=ps.psid and ptq.questionid=psq.questionid
         where ptq.paperid=#{paperid}
         <if test="papertype==3">
-            and locate(concat('"',ptq.questionid,'"'),ps.questionids)>0
+            and locate(concat('"',ptq.questionpid,'"'),ps.questionids)>0
         </if>
         group by ptq.ptqorder order by ptq.ptqorder
     </select>

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

@@ -5,7 +5,7 @@
     <select id="getQuestionAnalyze" resultType="com.xhkjedu.sstudy.model.question.TQuestionClass">
         select ptq.questionpid questionid,ptq.ptqorder qorder,ptq.mscore qscore,sum(ifnull(psq.stuscore,0))stuscore,ptq.schoolid,ptq.mqtypeid qtypeid
         ,(select count(*) from t_paper_student ps where ps.paperid=#{paperid} and ps.classid=#{classid}
-        <if test="qctype==3">and locate(concat('"',ptq.questionid,'"'),ps.questionids)>0</if>)stunum
+        <if test="qctype==3">and locate(concat('"',ptq.questionpid,'"'),ps.questionids)>0</if>)stunum
         ,(select q.hashear from t_question q where q.questionid=ptq.questionpid)hashear
         from t_paper_qtype_question ptq left join t_paper_student_question psq on ptq.paperid = psq.paperid
         and ptq.questionid=psq.questionid and psq.classid=#{classid}