教师APP作业按人统计完善

sstudy/src/main/java/com/xhkjedu/sstudy/listener/MessageConsumer.java

@@ -87,7 +87,7 @@ public class MessageConsumer {
             System.out.println(LocalDateTime.now() + " 学生答案合并接收消息内容：" + msg);
             TPaperStudentQuestion psq = JSON.parseObject(msg, TPaperStudentQuestion.class);
             Integer papertype = psq.getPapertype();
-            if (papertype == 1) {//题库作业
+            if (papertype == 1 || papertype == 3) {//题库作业
                 if (psq.getConverted() != 1) {//合并失败不修改学生答案
                     psq.setUseranswer(null);
                 } else {

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperTeaAppService.java

@@ -190,7 +190,7 @@ public class PaperTeaAppService {
     public Map getStudentScantron(PStudentVo paper){
         Map map = paperTeaAppMapper.getStudentScantron(paper);
         Integer papertype = Integer.parseInt(map.get("papertype").toString());
-        if(papertype == 1){
+        if(papertype != 2){
             List<Map> questions = (List<Map>) map.get("questions");
             List<String> qids = new ArrayList<>();
             List<Map> rtnques = new ArrayList<>();

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

@@ -178,7 +178,7 @@
         select p.papername,ps.papernum,truncate(ps.userscore*100/ps.paperscore,2)scorerate,#{paper.papertype} papertype
         ,ps.psid,ps.stoptime,ps.costtime,q.qorder,q.qn,truncate(q.stuscore*100/q.qscore,2)correctrate,q.stuscore,q.qscore
         ,(select count(*)+1 from t_paper_student ps1
-        where ps1.paperid=ps.paperid and ps1.userscore>ps.userscore)'rank',ps.paperscore,ps.userscore
+        where ps1.paperid=ps.paperid and ps1.classid=ps.classid and ps1.userscore>ps.userscore)'rank',ps.paperscore,ps.userscore
         <if test="paper.papertype==1 or paper.papertype==3">
             ,tq.qlevel,tq.questionid,tq.questionpid
         </if>

sstudy/src/main/resources/mapper/paperstudent/PaperStudentQuestionMapper.xml

@@ -12,6 +12,10 @@
         ELSE (SELECT json_object('qstem',fq.qstem,'qoption',fq.qoption,'qanswer',fq.qanswer,'qanalyze',fq.qanalyze
             ,'qtypename',fq.qtypename,'hashear',fq.hashear,'hearfile',fq.hearfile,'qlevel',fq.qlevel,'ctype',fq.ctype)
         FROM t_question fq WHERE fq.questionid=q.questionpid) END)mqstem
+        ,(case when q.questionpid is null then (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)
+            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.questionpid) end)pointname
         FROM t_paper_student_question psq LEFT JOIN t_question q ON psq.questionid=q.questionid
         WHERE psq.psid=#{psid} ORDER BY psq.psqid
     </select>