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

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

@@ -87,13 +87,21 @@ public class QuestionClassService {
         Integer qctype = question.getQctype();
         Integer checked = paperGroupMapper.getPaperClassChecked(paperid, classid);//获取班级作业是否结束批阅
         if (checked == 1) return;//已结束批阅不处理
-        String subjectid = paperMapper.getSubjectIdByPid(paperid);
+        TPaper paper = paperMapper.selectByPrimaryKey(paperid);
+        String subjectid = paper.getSubjectid();
+        Integer hashear;
+        if (N_Utils.isEmpty(paper.getHearfile())) {
+            hashear = 0;
+        } else {
+            hashear = 1;
+        }
         //已批阅未得满分的试题
         List<TQuestionStudent> questions = questionStudentService.listQuestions(paperid, classid, qctype);
         for (TQuestionStudent q : questions) {
             q.setQctype(qctype);
             q.setSubjectid(subjectid);
             q.setPaperid(paperid);
+            if (qctype == 2) q.setHashear(hashear);
             questionStudentService.updateQuestionStudent(q);
         }
 
@@ -118,6 +126,7 @@ public class QuestionClassService {
             Double errorrate = N_Utils.getDoubleDivideAndMulitiply((totalscore-stuscore),totalscore);
             q.setErrorrate(errorrate);
             q.setCreatetime(N_Utils.getSecondTimestamp());
+            if (qctype == 2) q.setHashear(hashear);
             if (errorrate > serrorrate){
                 list.add(q);
             }

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

@@ -117,7 +117,7 @@
         <if test="qctype==1 or qctype==3">
             select q.studentid,ptq.mscore qscore,sum(q.stuscore)stuscore,ptq.questionpid questionid
             ,ptq.mqtypeid qtypeid,ptq.ptqorder qorder,max(q.checked)checked
-            ,concat('[',group_concat(json_object('questionid',q.questionid,'qn',q.qn,'answertype',q.answertype
+            ,concat('[',group_concat(json_object('questionid',q.questionid,'qn',q.qn,'qorder',q.qorder,'answertype',q.answertype
             ,'useranswer',q.useranswer,'useranswertxt',q.useranswertxt,'converted',q.converted
             ,'qscore',q.qscore,'stuscore',q.stuscore,'ctype',ptq.ctype)),']')stujson
             ,(select tq.hashear from t_question tq where tq.questionid=ptq.questionpid)hashear
@@ -127,7 +127,7 @@
         </if>
         <if test="qctype==2">
             select q.studentid,q.qscore,q.stuscore,q.pscaid questionid,ps.qtypeid,ps.psorder qorder
-            ,concat('[',group_concat(json_object('questionid',q.pscaid,'qn',q.qorder,'answertype',q.answertype
+            ,concat('[',group_concat(json_object('questionid',q.pscaid,'qn',q.qn,'qorder',q.qorder,'answertype',q.answertype
             ,'useranswer',q.useranswer,'useranswertxt',q.useranswertxt,'converted',q.converted
             ,'qscore',q.qscore,'stuscore',q.stuscore,'ctype',ps.ctype)),']')stujson
             from t_paper_student_scantron q left join t_paper_scantron ps on q.pscaid=ps.pscaid