作业统计--按人详情(附件、题库、靶向)

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

@@ -139,6 +139,21 @@ public class PaperAnalyzeController {
         return new ResultVo(0,"获取答题卡作业统计--按人详情成功",paper);
     }
 
+    /**
+     * @Description 作业统计--按人详情
+     * @Param [student]
+     * @Author ywx
+     * @Date 2023/5/6 10:14
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/stu_detail")
+    public ResultVo StuDetailAnalyze(@RequestBody TPaperStudent student) {
+        Integer psid = student.getPsid();
+        N_Utils.validation(new Object[]{psid, "作业学生id", 1});
+        StudentPaperVo paper = paperAnalyzeService.getStuDetailAnalyze(psid);
+        return new ResultVo(0, "获取作业统计--按人详情成功", paper);
+    }
+
     @PostMapping("/paper_class")
     public ResultVo paperClass(@RequestBody TPaper paper){
         Integer paperid = paper.getPaperid();

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

@@ -148,6 +148,15 @@ public interface PaperAnalyzeMapper extends TkMapper<TPaperAnalyze> {
      **/
     List<StudentPaperTypeVo> listPeopleSDetailAnalyze(Integer psid);
 
+    /**
+     * @Description 答题卡作业统计 按人详情 题型列表
+     * @Param [psid]
+     * @Author ywx
+     * @Date 2023/5/6 10:30
+     * @return java.util.List<com.xhkjedu.sstudy.vo.paperstudent.StudentPaperTypeVo>
+     **/
+    List<StudentPaperTypeVo> listStuDetailAnalyze(Integer psid);
+
     /**
      * 获取作业提交情况
      * @Param [papernum, createid]

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

@@ -192,6 +192,29 @@ public class PaperAnalyzeService {
         return paper;
     }
 
+    /**
+     * @Description 作业统计--按人详情
+     * @Param [psid]
+     * @Author ywx
+     * @Date 2023/5/6 10:14
+     * @return com.xhkjedu.sstudy.vo.paperstudent.StudentPaperVo
+     **/
+    public StudentPaperVo getStuDetailAnalyze(Integer psid) {
+        StudentPaperVo paper = paperAnalyzeMapper.getStudentPaperAnalyze(psid);
+        Integer papertype = paper.getPapertype();
+        List<StudentPaperTypeVo> types;
+        if (papertype == 2) {//附件作业
+            types = paperAnalyzeMapper.listStuDetailAnalyze(psid);
+            List<TPaperFile> files = paperMapper.listPaperFile(paper.getPaperid(), 0);
+            paper.setFiles(files);
+        } else {
+            types = paperAnalyzeMapper.listPeopleDetailAnalyze(psid);
+            StudyUtil.setPaperQuestion(types, paperAnalyzeMapper);//处理母子题
+        }
+        paper.setTypes(types);
+        return paper;
+    }
+
     /**
      * 获取作业提交情况
      * @Param [papernum, createid]

sstudy/src/main/java/com/xhkjedu/sstudy/service/paperstudent/PaperGroupService.java

@@ -438,7 +438,7 @@ public class PaperGroupService {
                     //获取学生的试卷分值信息
                     List<TPaperQtypeQuestion> stuques = pquestions.stream().filter(
                             (pq) -> s.getQuestions().stream().collect(Collectors.toList()).contains(pq.getQuestionpid())).collect(Collectors.toList());
-                    if(N_Utils.isListNotEmpty(stuques)) continue;//学生收到的试题为空不保存
+                    if(N_Utils.isListEmpty(stuques)) continue;//学生收到的试题为空不保存
                     //计算学生试卷中试题总分值
                     double pscore = stuques.stream().collect(Collectors.summingDouble(TPaperQtypeQuestion::getPtqscore));
                     ps.setPaperscore(pscore);

sstudy/src/main/java/com/xhkjedu/sstudy/vo/paperstudent/PaperStudentQuestionVo.java

@@ -91,6 +91,9 @@ public class PaperStudentQuestionVo {
     //批语
     private String checkcomm;
 
+    //选项数量
+    private Integer optionnum;
+
     private String mqstem;//母题题干
     private String mqoption;//母题选项
     private String mqanswer;//母题答案

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

@@ -205,6 +205,7 @@
             <result property="sorder" column="sorder"></result>
             <result property="questionpid" column="questionpid"></result>
             <result property="qn" column="qn"></result>
+            <result property="optionnum" column="optionnum"></result>
         </collection>
     </resultMap>
     <!--作业统计 按人详情 题型列表-->
@@ -265,6 +266,16 @@
         LEFT JOIN t_paper_scantron_qtype psq ON psc.paperid = psq.paperid AND psc.psqtypeid=psq.psqtypeid
         WHERE pss.psid=#{psid} ORDER BY psq.pstorder,pss.qorder
     </select>
+    <!--答题卡作业统计 按人详情 题型列表-->
+    <select id="listStuDetailAnalyze" resultMap="typeQuestion">
+        SELECT psq.qtypename,psq.pstorder ptorder,psq.pstscore ptscore,psq.pstnum ptnum,
+        pss.pssid,pss.paperid,pss.studentid,pss.psid,pss.qn,pss.qorder,pss.answered,pss.answertype,pss.useranswer,pss.converted,pss.useranswertext,pss.useranswertxt,
+        pss.answertime,pss.costtime,pss.checked,pss.stuscore,pss.qscore,pss.pscaid questionid,pss.checkcomm,
+        psc.qtypeid,psc.ctype,psc.psanswer qanswer,psc.optionnum
+        FROM t_paper_student_scantron pss LEFT JOIN t_paper_scantron psc ON pss.pscaid = psc.pscaid
+        LEFT JOIN t_paper_scantron_qtype psq ON psc.paperid = psq.paperid AND psc.psqtypeid=psq.psqtypeid
+        WHERE pss.psid=#{psid} ORDER BY psq.pstorder,pss.qorder
+    </select>
     <resultMap id="commitAnalyze" type="com.xhkjedu.sstudy.vo.paper.PaperCAnalyzeVo">
         <result property="paperid" column="paperid"></result>
         <result property="papername" column="papername"></result>