附件作业生成试题相关报告优化

sexam/src/main/java/com/xhkjedu/sexam/mapper/paperstudent/EPaperStudentQuestionMapper.java

@@ -48,7 +48,7 @@ public interface EPaperStudentQuestionMapper extends TkMapper<EPaperStudentQuest
     void updateBatchStuQuestionScore(@Param("list")List<EPaperStudentQuestion> list);
 
     //报告生成-学生试卷
-    List<EPaperStudentQuestion> listExamStudentsAnswer(@Param("examid")Integer examid,@Param("stuzero")Integer stuzero);
+    List<EPaperStudentQuestion> listExamStudentsAnswer(@Param("examid")Integer examid);
 
     //学生作答得分试卷-题库
     List<Map> listQStuQuestionScore(@Param("epsid")Integer epsid);

sexam/src/main/java/com/xhkjedu/sexam/model/paperstudent/EPaperStudentQuestion.java

@@ -107,4 +107,8 @@ public class EPaperStudentQuestion extends BaseBean {
     @Transient
     private String classids;//班级ids
 
+    //学生试卷得分
+    @Transient
+    private Double stupaperscore;
+
 }

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

@@ -59,10 +59,10 @@ public class EReportGenerateQuestionService {
     @Resource
     private ERStudentComplexityMapper erStudentComplexityMapper;
 
-    public void setClassQuestion(Integer examid, List<Map> subjects, List<Map> classes, EBase base) {
+    public void setClassQuestion(Integer examid, List<Map> subjects, List<Map> classes, EBase base){
         Integer stuzero  = base.getStuzero();//0分学生是否参与统计0不统计1统计(默认)
         // 考试所有学生提交试卷作答情况 2023-12-27添加0分学生是否参与统计
-        List<EPaperStudentQuestion> stulist = ePaperStudentQuestionMapper.listExamStudentsAnswer(examid,stuzero);
+        List<EPaperStudentQuestion> stulist = ePaperStudentQuestionMapper.listExamStudentsAnswer(examid);
         if (N_Utils.isListNotEmpty(stulist)) {
             List<ERclassQtype> rtypelist = new ArrayList<>();// 班级题型
             List<ERStudentQtype> stutypelist = new ArrayList<>();// 学生题型
@@ -105,7 +105,7 @@ public class EReportGenerateQuestionService {
                         // 处理题型及题型下试题：附件显示题号为qn（order）作为排序使用
                         String qtypejson = panalyze.get("qnumjson").toString();// 原试卷题型分析
                         List<Map> qtypelist = JSON.parseArray(qtypejson, Map.class);
-                        setPaperQuestionFjQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo);
+                        setPaperQuestionFjQtypes(qtypelist, paperstulist, rtypelist, rqueslist, stutypelist, examPaperClassVo,stuzero);
                     }
                 }
             }
@@ -268,7 +268,7 @@ public class EReportGenerateQuestionService {
 
     // 题型、试题、知识点、难易度--附件题型
     private void setPaperQuestionFjQtypes(List<Map> qtypelist, List<EPaperStudentQuestion> paperstulist, List<ERclassQtype> rtypelist, List<ERclassQuestion> rqueslist,
-                                          List<ERStudentQtype> stutypelist, ExamPaperClassVo examPaperClassVo) {
+                                          List<ERStudentQtype> stutypelist, ExamPaperClassVo examPaperClassVo,Integer stuzero) {
         List<Map> classes = examPaperClassVo.getClasses();
         for (int k = 0; k < qtypelist.size(); k++) {
             Map qtypemap = qtypelist.get(k);
@@ -295,102 +295,144 @@ public class EReportGenerateQuestionService {
 
             for (int q = 0; q < eptqids.size(); q++) {
                 Integer eptqid = eptqids.get(q);
-                // 获取改题所有学生作答情况
-                List<EPaperStudentQuestion> qgstulist = paperstulist.stream().filter(s -> s.getEptqid().equals(eptqid)).collect(Collectors.toList());
+                //所有学生，包含0分的
+                List<EPaperStudentQuestion> qgstulistZero = paperstulist.stream().filter(s -> s.getEptqid().equals(eptqid)).collect(Collectors.toList());
+                EPaperStudentQuestion ePaperStudentQuestion = qgstulistZero.get(0);//获取第一个对象用于后续生成
+
+                // 获取该题所有学生作答情况
+                List<EPaperStudentQuestion> qgstulist = new ArrayList<>();
+                if(stuzero == 0){//如果为0：0分学生不参与统计
+                    qgstulist = qgstulistZero.stream().filter(s -> s.getStupaperscore() > 0).collect(Collectors.toList());
+
+                }else{
+                    //1:0分学生参与统计
+                    qgstulist.addAll(qgstulistZero);
+                }
                 gstunum = qgstulist.size();
-                EPaperStudentQuestion qgmaxstu = qgstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
-                Double qgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
-                qgscore = N_Utils.formatDouble(qgscore, 1);
-                Double qgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
-                qgstuscore = N_Utils.formatDouble(qgstuscore, 1);
-                Double qgavgscore = N_Utils.getDoubleDivideForAvg(qgstuscore, gstunum);// 年级平均分
-                Double qgsrate = N_Utils.getDoubleDivideAndMulitiply(qgstuscore, qgscore);
-                tgscore = ExamUtil.add(tgscore, qgscore);
-                tgstuscore = ExamUtil.add(tgstuscore, qgstuscore);
+
+                EPaperStudentQuestion qgmaxstu = null;
+                Double qgscore = 0D;
+                Double qgstuscore = 0D;
+                Double qgavgscore = 0D;
+                Double qgsrate = 0D;
+                if(gstunum > 0){
+                    qgmaxstu = qgstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
+                    qgscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                    qgscore = N_Utils.formatDouble(qgscore, 1);
+                    qgstuscore = qgstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                    qgstuscore = N_Utils.formatDouble(qgstuscore, 1);
+
+                    qgavgscore = N_Utils.getDoubleDivideForAvg(qgstuscore, gstunum);// 年级平均分
+
+                    qgsrate = N_Utils.getDoubleDivideAndMulitiply(qgstuscore, qgscore);
+                    tgscore = ExamUtil.add(tgscore, qgscore);
+                    tgstuscore = ExamUtil.add(tgstuscore, qgstuscore);
+                }
 
                 // 处理试题班级学生作答
                 for (Map classm : classes) {
                     Integer classid = Integer.parseInt(classm.get("classid").toString());
                     List<EPaperStudentQuestion> qcstulist = qgstulist.stream().filter(s -> s.getClassid().equals(classid)).collect(Collectors.toList());
-                    if (N_Utils.isListNotEmpty(qcstulist)) {
-                        int cstunum = qcstulist.size();// 班级下试题作答学生数量
-                        EPaperStudentQuestion qcmaxstu = qcstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
-                        Double qcscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
+                    List<EPaperStudentQuestion> qcstulistZero = qgstulistZero.stream().filter(s -> s.getClassid().equals(classid)).collect(Collectors.toList());
+
+                    int cstunum = qcstulist.size();//// 班级下试题作答学生数量
+                    EPaperStudentQuestion qcmaxstu = null;
+                    Double qcscore = 0D;
+                    Double qcstuscore = 0D;
+                    Double qcavgscore = 0D;
+                    Double qcsrate = 0D;
+                    if(cstunum>0){
+                        qcmaxstu = qcstulist.stream().max(Comparator.comparing(EPaperStudentQuestion::getStuscore)).get();
+                        qcscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getQscore).sum();
                         qcscore = N_Utils.formatDouble(qcscore, 1);
-                        Double qcstuscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
+                        qcstuscore = qcstulist.stream().mapToDouble(EPaperStudentQuestion::getStuscore).sum();
                         qcstuscore = N_Utils.formatDouble(qcstuscore, 1);
-                        Double qcavgscore = N_Utils.getDoubleDivideForAvg(qcstuscore, cstunum);
-                        Double qcsrate = N_Utils.getDoubleDivideAndMulitiply(qcstuscore, qcscore);
+                        qcavgscore=N_Utils.getDoubleDivideForAvg(qcstuscore, cstunum);
+                        qcsrate = N_Utils.getDoubleDivideAndMulitiply(qcstuscore, qcscore);
+                    }
 
-                        // 班级单题情况
-                        ERclassQuestion ercq = new ERclassQuestion();
-                        ercq.setCtype(qcstulist.get(0).getCtype());
-                        ercq.setExamid(examPaperClassVo.getExamid());
-                        ercq.setClassid(classid);
-                        ercq.setSubjectid(examPaperClassVo.getSubjectid());
-                        ercq.setEpid(examPaperClassVo.getEpid());
-                        ercq.setEptqid(eptqid);
-                        ercq.setQn(qns.get(q));
-                        ercq.setQorder(orders.get(q));
-                        ercq.setScore(scores.get(q));
-                        ercq.setQtypename(qtypenames.get(q));
-                        ercq.setClassscore(qcstuscore);
+                    // 班级单题情况
+                    ERclassQuestion ercq = new ERclassQuestion();
+                    ercq.setCtype(ePaperStudentQuestion.getCtype());
+                    ercq.setExamid(examPaperClassVo.getExamid());
+                    ercq.setClassid(classid);
+                    ercq.setSubjectid(examPaperClassVo.getSubjectid());
+                    ercq.setEpid(examPaperClassVo.getEpid());
+                    ercq.setEptqid(eptqid);
+                    ercq.setQn(qns.get(q));
+                    ercq.setQorder(orders.get(q));
+                    ercq.setScore(scores.get(q));
+                    ercq.setQtypename(qtypenames.get(q));
+                    ercq.setClassscore(qcstuscore);
+                    if(qcmaxstu == null){
+                        ercq.setClassmaxscore(0D);
+                    }else{
                         ercq.setClassmaxscore(qcmaxstu.getStuscore());
-                        ercq.setClassavgscore(qcavgscore);
-                        ercq.setClasssrate(qcsrate);
-                        ercq.setClassratetype(ExamUtil.getScoreRateType(qcsrate));
-                        ercq.setGradescore(qgstuscore);
+                    }
+                    ercq.setClassavgscore(qcavgscore);
+                    ercq.setClasssrate(qcsrate);
+                    ercq.setClassratetype(ExamUtil.getScoreRateType(qcsrate));
+                    ercq.setGradescore(qgstuscore);
+                    if(qgmaxstu == null){
+                        ercq.setGrademaxscore(0D);
+                    }else{
                         ercq.setGrademaxscore(qgmaxstu.getStuscore());
-                        ercq.setGradeavgscore(qgavgscore);
-                        ercq.setGradesrate(qgsrate);
-                        // 处理单选题选项情况
-                        Map stuansmap = setPaperQuestionsForStuAnswer(qcstulist);
-                        ercq.setFullscorenum(N_Utils.str2Int(stuansmap.get("fullscorenum").toString()));
-                        ercq.setAnswerjson(stuansmap.get("answerlist").toString());
-                        if (N_Utils.isNotEmpty(stuansmap.get("goodlist"))) {
-                            ercq.setGoodstujson(stuansmap.get("goodlist").toString());
-                        }
-                        if (N_Utils.isNotEmpty(stuansmap.get("badlist"))) {
-                            ercq.setBadstujson(stuansmap.get("badlist").toString());
-                        }
-                        if (N_Utils.isNotEmpty(stuansmap.get("erroroption"))) {
-                            ercq.setErroroption(stuansmap.get("erroroption").toString());
-                        } else {
-                            ercq.setErroroption("");
-                        }
-                        rqueslist.add(ercq);// 单个试题统计
+                    }
 
-                        if (tclassmap.containsKey(classid)) {
-                            ERClassScoreVo erClassScoreVo = tclassmap.get(classid);
-                            erClassScoreVo.setStuscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcstuscore));
-                            erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getCscore(), qcscore));
-                        } else {
-                            ERClassScoreVo erClassScoreVo = new ERClassScoreVo();
-                            erClassScoreVo.setStunum(cstunum);
-                            erClassScoreVo.setStuscore(qcstuscore);
-                            erClassScoreVo.setCscore(qcscore);
-                            tclassmap.put(classid, erClassScoreVo);
-                        }
+                    ercq.setGradeavgscore(qgavgscore);
+                    ercq.setGradesrate(qgsrate);
 
-                        for (EPaperStudentQuestion psq : qcstulist) {
-                            if (tstumap.containsKey(psq.getStudentid())) {
-                                ERStudentQtype sq = tstumap.get(psq.getStudentid());
-                                sq.setStuscore(ExamUtil.add(sq.getStuscore(), psq.getStuscore()));
-                            } else {
-                                ERStudentQtype sq = new ERStudentQtype();
-                                sq.setClassid(psq.getClassid());
-                                sq.setStudentid(psq.getStudentid());
-                                sq.setStuscore(psq.getStuscore());
-                                tstumap.put(psq.getStudentid(), sq);
-                            }
+                    // 处理单选题选项情况
+                    Map stuansmap = setPaperQuestionsForStuAnswer(qcstulistZero);
+                    ercq.setFullscorenum(N_Utils.str2Int(stuansmap.get("fullscorenum").toString()));
+                    ercq.setAnswerjson(stuansmap.get("answerlist").toString());
+                    if (N_Utils.isNotEmpty(stuansmap.get("goodlist"))) {
+                        ercq.setGoodstujson(stuansmap.get("goodlist").toString());
+                    }
+                    if (N_Utils.isNotEmpty(stuansmap.get("badlist"))) {
+                        ercq.setBadstujson(stuansmap.get("badlist").toString());
+                    }
+                    if (N_Utils.isNotEmpty(stuansmap.get("erroroption"))) {
+                        ercq.setErroroption(stuansmap.get("erroroption").toString());
+                    } else {
+                        ercq.setErroroption("");
+                    }
+                    
+                    rqueslist.add(ercq);// 单个试题统计
+
+                    if (tclassmap.containsKey(classid)) {
+                        ERClassScoreVo erClassScoreVo = tclassmap.get(classid);
+                        erClassScoreVo.setStuscore(ExamUtil.add(erClassScoreVo.getStuscore(), qcstuscore));
+                        erClassScoreVo.setCscore(ExamUtil.add(erClassScoreVo.getCscore(), qcscore));
+                    } else {
+                        ERClassScoreVo erClassScoreVo = new ERClassScoreVo();
+                        erClassScoreVo.setStunum(cstunum);
+                        erClassScoreVo.setStuscore(qcstuscore);
+                        erClassScoreVo.setCscore(qcscore);
+                        tclassmap.put(classid, erClassScoreVo);
+                    }
+
+                    for (EPaperStudentQuestion psq : qcstulistZero) {
+                        if (tstumap.containsKey(psq.getStudentid())) {
+                            ERStudentQtype sq = tstumap.get(psq.getStudentid());
+                            sq.setStuscore(ExamUtil.add(sq.getStuscore(), psq.getStuscore()));
+                        } else {
+                            ERStudentQtype sq = new ERStudentQtype();
+                            sq.setClassid(psq.getClassid());
+                            sq.setStudentid(psq.getStudentid());
+                            sq.setStuscore(psq.getStuscore());
+                            tstumap.put(psq.getStudentid(), sq);
                         }
                     }
                 }
             }
 
-            Double tgavgscore = N_Utils.getDoubleDivideForAvg(tgstuscore, gstunum);// 题型下年级平均分
-            Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);// 年级得分率
+            Double tgavgscore = 0D;
+            if(gstunum >0){
+                tgavgscore = N_Utils.getDoubleDivideForAvg(tgstuscore, gstunum);// 题型下年级平均分
+            }
 
+            Double tgsrate = N_Utils.getDoubleDivideAndMulitiply(tgstuscore, tgscore);// 年级得分率
             // 题型--班级得分
             for (Map.Entry<Integer, ERClassScoreVo> entry : tclassmap.entrySet()) {
                 ERClassScoreVo erClassScoreVo = entry.getValue();
@@ -408,12 +450,21 @@ public class EReportGenerateQuestionService {
                 eRclassQtype.setGradeavgscore(tgavgscore);
                 eRclassQtype.setGradesrate(tgsrate);
                 eRclassQtype.setClassscore(erClassScoreVo.getStuscore());
-                eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideForAvg(erClassScoreVo.getStuscore(), erClassScoreVo.getStunum()));
-                eRclassQtype.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getStuscore(), erClassScoreVo.getCscore()));
+                if(erClassScoreVo.getStunum() == 0){
+                    eRclassQtype.setClassavgscore(0D);
+                }else{
+                    eRclassQtype.setClassavgscore(N_Utils.getDoubleDivideForAvg(erClassScoreVo.getStuscore(), erClassScoreVo.getStunum()));
+                }
+
+                if(erClassScoreVo.getCscore() == 0){
+                    eRclassQtype.setClasssrate(0D);
+                }else{
+                    eRclassQtype.setClasssrate(N_Utils.getDoubleDivideAndMulitiply(erClassScoreVo.getStuscore(), erClassScoreVo.getCscore()));
+                }
+
                 eRclassQtype.setQns(qns.stream().map(String::valueOf).collect(Collectors.joining(",")));
                 rtypelist.add(eRclassQtype);
             }
-
             // 题型--学生得分
             for (Map.Entry<Integer, ERStudentQtype> entry : tstumap.entrySet()) {
                 ERStudentQtype erStudentQtype = entry.getValue();

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

@@ -90,6 +90,7 @@ public class EReportGenerateService {
     //优秀、学困生对比（根据报告设置参数计算）
     @Transactional(rollbackFor = Exception.class)
     public void generateExamReport(Integer examid, Integer createid) throws Exception {
+
         //生成前先删除以前的考试报告
         eReportGenerateMapper.deleteExamReport(examid);
         //学生上次考试排名及目标
@@ -207,7 +208,6 @@ public class EReportGenerateService {
         rbase.setAvgscore(schoolStatisticsAverage);
         rbase.setMixscore(schoolStatisticsMin);
         eRbaseMapper.insertSelective(rbase);
-
         Map<String, List<ERstudent>> subCollect = students.stream().collect(Collectors.groupingBy(s -> s.getSubjectid()));
         List<ERsubject> subjectList = new ArrayList<>();//考试报告科目情况
         List<ERclass> classList = new ArrayList<>();//考试报告班级情况
@@ -239,7 +239,6 @@ public class EReportGenerateService {
         setClassAvgRank(classList);//班级科目平均分排名
         if (N_Utils.isListNotEmpty(classList)) eRclassMapper.insertList(classList);
         if (N_Utils.isListNotEmpty(subjectList)) eRsubjectMapper.insertList(subjectList);
-
         setRank(schoolStudents, schoolStuRank, 1);//学校学生分数排名
 
         Map<String, ERclass> rclassMap = classList.stream().collect(Collectors.toMap(c -> (c.getClassid() + "_" + c.getSubjectid()), c -> c));
@@ -259,7 +258,6 @@ public class EReportGenerateService {
             cs.setBzscore(ExamUtil.standardScore(cs.getScore(), cs.getSchoolavgscore(), bzc));//学生标准分
         }
         if (N_Utils.isListNotEmpty(classStudents)) eRstudentMapper.insertList(classStudents);
-
         for (ERstudent cs : classSubjectStudents) {
             Integer studentid = cs.getStudentid();
             Integer classid = cs.getClassid();
@@ -278,7 +276,6 @@ public class EReportGenerateService {
             cs.setBzscore(ExamUtil.standardScore(cs.getScore(), cs.getSchoolavgscore(), bzc));//学生标准分
         }
         if (N_Utils.isListNotEmpty(classSubjectStudents)) eRstudentMapper.insertList(classSubjectStudents);
-
         eReportGenerateQuestionService.setClassQuestion(examid, subjects, classes,base);//题型试题
         Map<Integer, String> userMap = new HashMap<>();//用户姓名map
         Map<Integer, String> userMap2 = new HashMap<>();//用户账号_姓名map
@@ -299,7 +296,7 @@ public class EReportGenerateService {
 
         setAction(examid, userMap);//行为分析
         eBaseMapper.updateExamState(examid,3);
-        htmlToPdf(examid, classes, schoolStudents, userMap2);//考试报告html转pdf
+        // htmlToPdf(examid, classes, schoolStudents, userMap2);//考试报告html转pdf
     }
 
     /**

sexam/src/main/resources/mapper/paperstudent/EPaperStudentQuestionMapper.xml

@@ -84,13 +84,10 @@
     <!--报告生成-学生试卷-->
     <select id="listExamStudentsAnswer" resultType="com.xhkjedu.sexam.model.paperstudent.EPaperStudentQuestion">
         select q.epsqid,q.classid,q.studentid,q.epid,q.eptqid,q.ctype,q.qn,q.answertype,q.stuanswer,q.qscore,
-        q.stuscore,q.good,q.bad,u.username stuname,pq.answer
+        q.stuscore,q.good,q.bad,u.username stuname,pq.answer,s.stuscore as stupaperscore
         from e_paper_student_question q left join e_paper_student s on s.epsid=q.epsid
         left join e_paper_qtype_question pq on q.eptqid=pq.eptqid
         left join t_user u on q.studentid=u.userid where s.examid=#{examid}
-        <if test="stuzero!=null and stuzero==0">
-            and s.stuscore > 0
-        </if>
         group by q.epsqid order by pq.qorder,pq.eptqid
     </select>