作业按题统计

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

     }
 
     @PostMapping("/question_detail")
-    public ResultVo questionDetailAnalyze(@RequestBody TPaperStudentQuestion paper){
+    public ResultVo questionDetailAnalyze(@RequestBody AnalyzeQuestionVo paper){
         Integer paperid = paper.getPaperid();
         String questionid = paper.getQuestionid();
         Integer classid=paper.getClassid();
         N_Utils.validation(new Object[]{paperid,"作业id",1,questionid,"试题id",2,classid,"班级id",1});
-        QuestionAnalyzeVo analyze = paperAnalyzeService.getQuestionDetailAnalyze(paperid, questionid,classid);
+        QuestionAnalyzeVo analyze = paperAnalyzeService.getQuestionDetailAnalyze(paper);
         return new ResultVo(0,"获取作业统计--按题详情成功",analyze);
     }
 

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

      * @Date 2020/6/24 15:37
      * @return com.xhkjedu.vo.paper.QuestionAnalyzeVo
      **/
-    QuestionAnalyzeVo getQuestionDetailAnalyze(Integer paperid, String questionid, Integer classid);
+    QuestionAnalyzeVo getQuestionDetailAnalyze(@Param("question") AnalyzeQuestionVo question);
 
     //作业统计--按题详情--学生列表
     List<AnalyzeStudentVo> listQuestionStu(Integer paperid, String questionid, Integer classid, Integer od);

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

 import com.xhkjedu.sstudy.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.sstudy.mapper.paper.PaperAnalyzeMapper;
 import com.xhkjedu.sstudy.mapper.paper.PaperMapper;
+import com.xhkjedu.sstudy.mapper.question.QuestionMapper;
 import com.xhkjedu.sstudy.mapper.subjectbook.SubjectMapper;
 import com.xhkjedu.sstudy.mapper.system.SchoolMapper;
 import com.xhkjedu.sstudy.model.paper.TPaper;
     private SchoolMapper schoolMapper;
     @Resource
     private SubjectMapper subjectMapper;
+    @Resource
+    private QuestionMapper questionMapper;
 
     /**
      * 作业分析
      * @Date 2020/6/24 15:37
      * @return com.xhkjedu.sstudy.vo.paper.QuestionAnalyzeVo
      **/
-    public QuestionAnalyzeVo getQuestionDetailAnalyze(Integer paperid, String questionid,Integer classid) {
-        return paperAnalyzeMapper.getQuestionDetailAnalyze(paperid, questionid,classid);
+    public QuestionAnalyzeVo getQuestionDetailAnalyze(AnalyzeQuestionVo question) {
+        QuestionAnalyzeVo analyze = paperAnalyzeMapper.getQuestionDetailAnalyze(question);
+        String questionpid = question.getQuestionpid();
+        String questionid = question.getQuestionid();
+        if(N_Utils.isEmpty(questionpid)) question.setQuestionpid(questionid);
+        if (!questionpid.equals(questionid)) {
+            List<Map> sonqlist = questionMapper.listSonQuestionsForDetail(questionpid);
+            analyze.setSonqlist(sonqlist);
+        }
+        return analyze;
     }
 
     //作业统计--按题详情--学生列表

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

 
     //学生人数
     private Integer stunum;
+    private String questionpid;//复合题对应母题id
+    private String qns;//显示题号
 }

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

 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class QuestionAnalyzeVo {
 
     //知识点名称
     private String pointname;
+    private List<Map> sonqlist;//子题
 }

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

     </select>
     <!--作业统计按题-->
     <select id="getQuestionAnalyze" resultType="com.xhkjedu.sstudy.vo.paper.AnalyzeQuestionVo">
-        select ptq.paperid,ptq.questionid,ptq.ptqorder,q.qtypename,ptq.ptqscore totalscore,q.qanswer,truncate(avg(psq.stuscore),2)avgscore
+        select ptq.paperid,ptq.questionid,ptq.ptqorder,ptq.questionpid
+        ,group_concat(distinct concat(ptq.qn,'_',ptq.questionid))qns
+        ,ptq.mqtypename qtypename,ptq.mscore totalscore,truncate(avg(psq.stuscore),2)avgscore
         ,truncate(avg(psq.costtime),2)avgtime,min(psq.costtime)mintime,count(ps.psid)stunum
         ,truncate(sum(case when psq.answered=1 then 1 else 0 end)*100/count(ps.psid),2)commitrate
         ,truncate(SUM(IFNULL(psq.stuscore,0))*100/(ptq.ptqscore*count(ps.psid)),2)scorerate
         <if test="papertype==3">
             and locate(concat('"',ptq.questionid,'"'),ps.questionids)>0
         </if>
-        group by ptq.questionid order by ptq.ptqorder
+        group by ptq.ptqorder order by ptq.ptqorder
     </select>
     <!--答题卡作业统计按题-->
     <select id="getSQuestionAnalyze" resultType="com.xhkjedu.sstudy.vo.paper.AnalyzeQuestionVo">
 
     <select id="getQuestionDetailAnalyze" resultType="com.xhkjedu.sstudy.vo.paper.QuestionAnalyzeVo">
         select q.qtypename,q.qstem,q.qoption,q.qanswer,q.qanalyze,q.ctype
-        ,(select ptq.ptqscore from t_paper_qtype_question ptq
-        where ptq.paperid=#{paperid} and ptq.questionid=#{questionid}) score
+        ,(select ptq.mscore from t_paper_qtype_question ptq
+        where ptq.paperid=#{question.paperid} and ptq.questionpid=#{question.questionpid} limit 1) score
         ,(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 q.questionid=#{questionid}
+        from t_question q where q.questionid=#{question.questionpid}
     </select>
     <!--作业统计-按题详情-学生列表-->
     <select id="listQuestionStu" resultType="com.xhkjedu.sstudy.vo.paper.AnalyzeStudentVo">