高频错题和作业报告

sexam/src/main/java/com/xhkjedu/sexam/service/report/EReportClassService.java

@@ -109,9 +109,12 @@ public class EReportClassService {
             //知识点
             setQuestionPoint(ct);
 
+            Integer ctype = Integer.parseInt(ct.get("ctype").toString());
+            if(!N_Utils.isObjectiveQuestion(ctype)){
+                ct.put("answer","[]");
+            }
             ct.remove("answerjson");
             ct.remove("ctype");
-            ct.remove("answer");
             ct.remove("pointjson");
         }
         return gpctList;

sexam/src/main/resources/mapper/report/ERclassMapper.xml

@@ -78,7 +78,7 @@
     <!--班级报告-单科概况-高频错题-->
     <select id="listGpCt" resultType="java.util.Map">
         select erq.eptqid,erq.qn,erq.classsrate,erq.gradesrate,erq.answerjson,erq.erroroption
-        ,epq.eptname,epq.ctype,epqq.answer,epa.pointjson
+        ,epq.eptname,epqq.answer,epqq.ctype,epa.pointjson
         from e_rclass_question erq left join e_paper_qtype_question epqq on erq.epid = epqq.epid and erq.qorder=epqq.qorder
         left join e_paper_qtype epq on epqq.eptid = epq.eptid
         left join e_paper_analyze epa on erq.epid = epa.epid

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperTeaAppController.java

@@ -84,6 +84,7 @@ public class PaperTeaAppController {
         return new ResultVo(0,"获取已提交学生列表成功",list);
     }
 
+    //
     @PostMapping("/student_scantron")
     public ResultVo studentScantron(@RequestBody PStudentVo paper) {
         Integer psid = paper.getPsid();
@@ -102,6 +103,7 @@ public class PaperTeaAppController {
         return new ResultVo(0,"获取学生答题卡单题详情成功",question);
     }
 
+    //作业统计单题统计
     @PostMapping("/question_detail")
     public ResultVo questionDetail(@RequestBody TQuestionClass question) {
         Long paperid = question.getPaperid();

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperTeaAppMapper.java

@@ -88,7 +88,7 @@ public interface PaperTeaAppMapper extends TkMapper<TPaper> {
      * @Author ywx
      * @Date 2020/10/15 11:11
      **/
-    PQuestionVo getQuestionDetail(@Param("question") TQuestionClass question);
+    List<PQuestionVo> getQuestionDetail(@Param("question") TQuestionClass question);
 
     //未布置作业列表
     List<PaperTeacherAppVo> listWbz(@Param("paper") PaperSearchVo paperSearch);

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

@@ -4,11 +4,7 @@ import com.xhkjedu.sstudy.mapper.paper.PaperMapper;
 import com.xhkjedu.sstudy.mapper.paper.PaperTeaAppMapper;
 import com.xhkjedu.sstudy.model.paper.TPaper;
 import com.xhkjedu.sstudy.model.question.TQuestionClass;
-import com.xhkjedu.sstudy.vo.paper.PClassVo;
-import com.xhkjedu.sstudy.vo.paper.PQuestionVo;
-import com.xhkjedu.sstudy.vo.paper.PStudentVo;
-import com.xhkjedu.sstudy.vo.paper.PaperTeacherAppVo;
-import com.xhkjedu.sstudy.vo.paper.PaperTeacherReportVo;
+import com.xhkjedu.sstudy.vo.paper.*;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperSearchVo;
 import com.xhkjedu.sstudy.vo.paperstudent.PaperStudentQuestionVo;
 import com.xhkjedu.sstudy.vo.paperstudent.StudentVo;
@@ -17,10 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.IntSummaryStatistics;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -174,7 +167,43 @@ public class PaperTeaAppService {
      * @return com.xhkjedu.vo.teacherapp.PQuestionVo
      **/
     public PQuestionVo getQuestionDetail(TQuestionClass question) {
-        PQuestionVo q = paperTeaAppMapper.getQuestionDetail(question);
+        List<PQuestionVo> qlist = paperTeaAppMapper.getQuestionDetail(question);
+        PQuestionVo q = new PQuestionVo();
+        if(qlist.size() == 1){
+            q = qlist.get(0);
+        }else{
+            //说明该题是复合题
+            List<PStudentVo> mstulist = new ArrayList<>();
+            double mqscore  = 0;
+            String qtypename = "";
+            for(int i=0;i<qlist.size();i++ ){
+                PQuestionVo sqvo = qlist.get(i);
+                mqscore = N_Utils.getDoubleSum(mqscore,sqvo.getQscore());
+                List<PStudentVo> sstulist = sqvo.getStudents();
+                if(i==0){
+                    qtypename = sqvo.getMqtypename();
+                    mstulist.addAll(sstulist);
+                }else{
+                    for(PStudentVo pstuvo : sstulist){
+                        PStudentVo mstuvo = mstulist.stream().filter(s -> s.getStudentid().equals(pstuvo.getStudentid())).findFirst().orElse(null);
+                        if(mstuvo == null){
+                            //说明还没有改学生
+                            mstulist.add(pstuvo);
+                        }else{
+                            double sstuscore = N_Utils.getDoubleSum(mstuvo.getScorerate(),pstuvo.getScorerate());
+                            mstuvo.setScorerate(sstuscore);
+                            if(pstuvo.getPschecked() == 1){
+                                mstuvo.setPschecked(1);
+                            }
+                        }
+                    }
+                }
+            }
+            q.setQtypename(qtypename);
+            q.setStudents(mstulist);
+            q.setQscore(mqscore);
+        }
+
         Double qscore = q.getQscore();
         List<PStudentVo> students = q.getStudents();
         double stuscore = students.stream().collect(Collectors.summingDouble(PStudentVo::getScorerate));

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/PQuestionVo.java

@@ -15,6 +15,9 @@ public class PQuestionVo {
     //题型名称
     private String qtypename;
 
+    //母题题型名称
+    private String mqtypename;
+
     //试题分值
     private Double qscore;
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/PStudentVo.java

@@ -18,6 +18,8 @@ public class PStudentVo {
     //作业学生id
     private Integer psid;
 
+    private Integer studentid;
+
     //学生姓名
     private String studentname;
 

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paper/PaperTeacherReportVo.java

@@ -10,6 +10,9 @@ public class PaperTeacherReportVo {
     //试题序号
     private Integer qorder;
 
+    //题号
+    private String qn;
+
     //正确率
     private double correctrate;
 

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

@@ -120,13 +120,14 @@
         <result property="userscore" column="userscore"></result>
         <collection property="questions" ofType="com.xhkjedu.sstudy.vo.paper.PaperTeacherReportVo">
             <result property="qorder" column="qorder"></result>
+            <result property="qn" column="qn"></result>
             <result property="correctrate" column="correctrate"></result>
             <result property="ctype" column="ctype"></result>
         </collection>
     </resultMap>
     <select id="getStudentScantron" resultMap="scantronResult">
         select p.papername,ps.papernum,truncate(ps.userscore*100/ps.paperscore,2)scorerate,#{paper.papertype} papertype
-        ,ps.psid,ps.stoptime,ps.costtime,q.qorder,truncate(q.stuscore*100/q.qscore,2)correctrate,tq.ctype
+        ,ps.psid,ps.stoptime,ps.costtime,q.qorder,q.qn,truncate(q.stuscore*100/q.qscore,2)correctrate,tq.ctype
         ,(select count(*)+1 from t_paper_student ps1
         where ps1.paperid=ps.paperid and ps1.userscore>ps.userscore)rank,ps.paperscore,ps.userscore
         from t_paper_student ps left join t_paper p on ps.paperid = p.paperid
@@ -157,7 +158,9 @@
         <result property="qscore" column="qscore"></result>
         <result property="avgtime" column="avgtime"></result>
         <result property="mintime" column="mintime"></result>
+        <result property="mqtypename" column="mqtypename"></result>
         <collection property="students" ofType="com.xhkjedu.sstudy.vo.paper.PStudentVo">
+            <result property="studentid" column="studentid"></result>
             <result property="studentname" column="studentname"></result>
             <result property="stoptime" column="answertime"></result>
             <result property="costtime" column="costtime"></result>
@@ -167,9 +170,11 @@
     </resultMap>
     <!--20220421修改获取提交作业的学生未基准-->
     <select id="getQuestionDetail" resultMap="questionDetailResult">
-        select tq.qtypename,q.qscore,q.answertime,q.costtime,q.stuscore,q.answered,u.username studentname
+        select tq.qtypename,q.qscore,q.answertime,q.costtime,q.stuscore,q.answered,q.studentid,u.username studentname
         <if test="question.qctype==1 or question.qctype==3">
+            ,mq.qtypename mqtypename
             from t_paper_student_question q left join t_question tq on q.questionid=tq.questionid
+            left join t_question mq on tq.questionpid=mq.questionid
         </if>
         <if test="question.qctype==2">
             from t_paper_student_scantron q left join t_paper_scantron tq on q.pscaid=tq.pscaid
@@ -179,6 +184,37 @@
         where q.paperid=#{question.paperid} and q.qorder=#{question.qorder} and q.classid=#{question.classid} and ps.psstate>0
         order by q.stuscore desc,convert(u.username using gbk)
     </select>
+
+    <!--<resultMap id="questionDetailResult" type="java.util.Map">
+        <result property="qtypename" column="qtypename"></result>
+        <result property="qscore" column="qscore"></result>
+        <result property="mqtypename" column="mqtypename"></result>
+        <collection property="students" ofType="java.util.Map" javaType="java.util.List">
+            <result property="studentid" column="studentid"></result>
+            <result property="studentname" column="studentname"></result>
+            <result property="stoptime" column="answertime"></result>
+            <result property="costtime" column="costtime"></result>
+            <result property="scorerate" column="stuscore"></result>
+            <result property="pschecked" column="answered"></result>
+        </collection>
+    </resultMap>
+    &lt;!&ndash;20220421修改获取提交作业的学生未基准&ndash;&gt;
+    <select id="getQuestionDetail" resultMap="questionDetailResult">
+        select tq.qtypename,q.qscore,q.studentid,q.answertime,q.costtime,q.stuscore,q.answered,u.username studentname
+        <if test="question.qctype==1 or question.qctype==3">
+            ,mq.qtypename mqtypename
+            from t_paper_student_question q left join t_question tq on q.questionid=tq.questionid
+            left join t_question mq on tq.questionid=mq.questionid
+        </if>
+        <if test="question.qctype==2">
+            from t_paper_student_scantron q left join t_paper_scantron tq on q.pscaid=tq.pscaid
+        </if>
+        left join t_user u on q.studentid=u.userid
+        left join t_paper_student ps on q.paperid=ps.paperid and q.studentid=ps.studentid
+        where q.paperid=#{question.paperid} and q.qorder=#{question.qorder} and q.classid=#{question.classid} and ps.psstate>0
+        order by q.stuscore desc,convert(u.username using gbk)
+    </select>-->
+
     <!--作业发布的人数-->
     <select id="getPaperstudentNum" resultType="java.lang.Integer">
         select count(*) from t_paper_student where paperid=#{paperid} and classid=#{classid}