完善试题模板、试卷详情

smarking/pom.xml

@@ -32,12 +32,6 @@
             <version>3.17</version>
         </dependency>
 
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4</version>
-        </dependency>
-
     </dependencies>
     <dependencyManagement>
         <dependencies>

smarking/src/main/java/com/xhkjedu/smarking/controller/paper/MsTemplateController.java

@@ -50,8 +50,7 @@ public class MsTemplateController {
     @PostMapping("/save")
     public ResultVo save(@RequestBody MsTemplate msTemplate) {
         N_Utils.validation(new Object[]{msTemplate.getMpid(),"试卷id",1});
-        MsTemplate mt = msTemplateService.save(msTemplate);
-        return new ResultVo(0, "保存成功",mt);
+        return new ResultVo(0, "保存成功",msTemplateService.save(msTemplate));
     }
 
     /*

smarking/src/main/java/com/xhkjedu/smarking/model/paper/MsTemplate.java

@@ -21,7 +21,7 @@ public class MsTemplate extends BaseBean {
     private Integer mtid;
     //试卷ID
     private Integer mpid;
-    //模板尺寸1A3 2A4
+    //模板尺寸1A4 2A3
     private Integer tsize;
     //正面图片
     private String tfront;

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportclass/MsrClassQuestion.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description 阅卷报告-班级试题小题分析表
@@ -89,4 +90,7 @@ public class MsrClassQuestion extends BaseBean {
     private String mfids;
     //满分人数占比
     private Double mfrate;
+
+    @Transient
+    private String classname;
 }

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsPaperQtypeService.java

@@ -1115,23 +1115,13 @@ public class MsPaperQtypeService {
         if (ptype == 1) {
             // 题库
             qtypelist = msPaperQtypeMapper.listPaperQtypeQuestions(mpid);
-            for (MsPaperQtypeVo qtype : qtypelist) {
-                List<MsPaperQtypeQuestionVo> questions = qtype.getQuestions();
-                for (MsPaperQtypeQuestionVo question : questions) {
-                    if(N_Utils.isNotEmpty(question.getAnswer())){
-                        //如果试卷已有答案，把试卷中设置的答案返回
-                        question.setQanswer(question.getAnswer());
-                    }
-
-                }
-            }
+            setPaperQuestionQtypeQuesitonTk(qtypelist);
             paper.put("qtypes", qtypelist);
         } else {
             // 附件
             qtypelist = msPaperQtypeMapper.listPaperQtypeQuesitonsForFj(mpid);
             List<Map<String, Object>> qtypes = new ArrayList<>();
             setPaperQuestionQtypeQuesitonFj(qtypelist, qtypes);
-
             paper.put("qtypes", qtypes);
 
             // 试卷文件
@@ -1146,6 +1136,58 @@ public class MsPaperQtypeService {
         return paper;
     }
 
+
+    private void setPaperQuestionQtypeQuesitonTk(List<MsPaperQtypeVo> typelist){
+        for(MsPaperQtypeVo qt : typelist){
+            List<MsPaperQtypeQuestionVo> qlist = qt.getQuestions();
+            List<MsPaperQtypeQuestionVo> rtnqlist = new ArrayList<>();//保存处理后的试题
+            String qpid = "";//母题id
+            List<MsPaperQtypeQuestionVo> sonqlist = new ArrayList<>();
+            for(MsPaperQtypeQuestionVo q : qlist){
+                //试题类型1单题2母题3子题
+                if(q.getQlevel() == 3){
+                    if(!q.getQuestionpid().equals(qpid)){
+                        sonqlist = qlist.stream().filter(o -> q.getQlevel()==3 && q.getQuestionpid().equals(o.getQuestionpid())).collect(Collectors.toList());
+                        MsPaperQtypeQuestionVo mq = new MsPaperQtypeQuestionVo();
+                        mq.setQuestionid(q.getQuestionpid());
+                        mq.setCtype(q.getMctype());
+                        mq.setQtypeid(q.getMqtypeid());
+                        mq.setQtypename(q.getMqtypename());
+                        mq.setQstem(q.getMqstem());
+                        mq.setComplexity(q.getMcomplexity());
+                        mq.setQanalyze(q.getMqanalyze());
+                        mq.setQanswer(q.getMqanswer());
+                        mq.setQorder(q.getQorder());
+                        mq.setQlevel(q.getMqlevel());
+                        mq.setHashear(q.getMhashear());
+                        mq.setHearfile(q.getMhearfile());
+                        Double mscore = sonqlist.stream().collect(Collectors.summingDouble(MsPaperQtypeQuestionVo:: getQscore));
+                        mq.setQscore(mscore);
+
+                        for(MsPaperQtypeQuestionVo sonQ : sonqlist){
+                            if(N_Utils.isNotEmpty(sonQ.getAnswer())){
+                                //如果试卷已有答案，把试卷中设置的答案返回
+                                sonQ.setQanswer(sonQ.getAnswer());
+                            }
+                        }
+
+                        mq.setSonques(sonqlist);
+                        mq.setPoints(sonqlist.get(0).getPoints());
+                        rtnqlist.add(mq);
+                    }
+                    qpid = q.getQuestionpid();
+                }else{
+                    if(N_Utils.isNotEmpty(q.getAnswer())){
+                        //如果试卷已有答案，把试卷中设置的答案返回
+                        q.setQanswer(q.getAnswer());
+                    }
+                    rtnqlist.add(q);
+                }
+            }
+            qt.setQuestions(rtnqlist);
+        }
+    }
+
     // 试卷详情-附件-设置返回值
     private void setPaperQuestionQtypeQuesitonFj(List<MsPaperQtypeVo> qtypelist, List<Map<String, Object>> qtypes) {
         for (MsPaperQtypeVo qtypeVo : qtypelist) {

smarking/src/main/java/com/xhkjedu/smarking/service/paper/MsTemplateService.java

@@ -83,7 +83,7 @@ public class MsTemplateService {
      * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
-    public MsTemplate save(MsTemplate msTemplate){
+    public Integer save(MsTemplate msTemplate){
         msTemplate.setCreatetime(N_Utils.getSecondTimestamp());
         msTemplate.setCurrstep(1);
         msTemplate.setTstate(0);
@@ -107,7 +107,7 @@ public class MsTemplateService {
 
         //更新科目模板状态
         msSubjectMapper.updatePtstateByMpid(msTemplate.getMpid(),1);
-        return msTemplate;
+        return mtid;
     }
 
     /*
@@ -179,7 +179,7 @@ public class MsTemplateService {
             //包含的试题信息
             List<MsPaperQtypeQuestion> selQuestions = questions.stream().filter(q -> tbqns.contains(q.getQn())).collect(Collectors.toList());
             if(selQuestions.isEmpty() || selQuestions.size() != tbquestions.size()){
-                throw new RuntimeException("试题信息和试卷不匹配");
+                throw new MissingParametersException("试题信息和试卷不匹配");
             }
 
             Double tbqScores = selQuestions.stream().mapToDouble(MsPaperQtypeQuestion::getQscore).sum();//题块下试题总分值
@@ -210,7 +210,7 @@ public class MsTemplateService {
             for(MsTemplateBlockQuestion tbquestion : tbquestions) {
                 MsPaperQtypeQuestion q = selQuestions.stream().filter(q1 -> q1.getQn().equals(tbquestion.getQn())).findFirst().orElse(null);
 
-                if(q == null) throw new RuntimeException("试题信息和试卷不匹配");
+                if(q == null) throw new MissingParametersException("试题信息和试卷不匹配");
 
                 tbquestion.setMtbid(mtbid);
                 tbquestion.setMptqid(q.getMptqid());
@@ -396,14 +396,8 @@ public class MsTemplateService {
         MsTemplate msTemplate = msTemplateMapper.selectByPrimaryKey(mtid);
         int mpid = msTemplate.getMpid();
         msTemplateMapper.deleteByPrimaryKey(mtid);
-        //获取试卷中所有模板题块框选状态
-        int tbnum = msTemplateMapper.getUnSelTemplateCount(mpid);
-        if(tbnum == 0){
-            //更改科目题块框选状态已完成
-            msSubjectMapper.updatePbstateByMpid(mpid,2);
-            //保存学生试卷试题信息
-            savePaperStudentBlock(mpid);
-        }
+        //更改科目题块框选状态未设置
+        msSubjectMapper.updatePbstateByMpid(mpid,0);
     }
 
     /*

smarking/src/main/java/com/xhkjedu/smarking/service/report/generate/ReportGeneratePointService.java

@@ -24,7 +24,7 @@ import com.xhkjedu.smarking.vo.report.reportsubject.PointLevelVo;
 import com.xhkjedu.smarking.vo.report.reportsubject.PointParams;
 import com.xhkjedu.smarking.vo.report.reportsubject.PointVo;
 import com.xhkjedu.utils.N_Utils;
-import org.apache.commons.beanutils.BeanUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -239,9 +239,9 @@ public class ReportGeneratePointService {
         classPoint.setFullscore(subjectPoint.getFullscore());
         classPoint.setMaxscore(pointStuScores.stream().mapToDouble(PointStudentVo::getStuscore).max().orElse(0.0));
         classPoint.setMinscore(pointStuScores.stream().mapToDouble(PointStudentVo::getStuscore).min().orElse(0.0));
-        classPoint.setScorerate(MarkingUtil.calculateRate(sumScore, subjectPoint.getFullscore() * stuNum));
+        classPoint.setScorerate(MarkingUtil.div(sumScore, subjectPoint.getFullscore() * stuNum));
         classPoint.setAvgscore(MarkingUtil.div(sumScore, stuNum));
-        classPoint.setAvgrate(MarkingUtil.calculateRate(classPoint.getAvgscore(), subjectPoint.getFullscore()));
+        classPoint.setAvgrate(MarkingUtil.div(classPoint.getAvgscore(), subjectPoint.getFullscore()));
         classPoint.setBzc(MarkingUtil.bzc(stuScores));
         classPoint.setCyxs(MarkingUtil.div(classPoint.getBzc(), classPoint.getAvgscore()));
         classPoint.setQfd(MarkingUtil.qfd(stuScores));
@@ -298,8 +298,7 @@ public class ReportGeneratePointService {
                 // 获取平均分
                 double avgScore = MarkingUtil.div(sumScore, stuNum);
                 // 获取平均得分率
-                double avgScoreRate = MarkingUtil.calculateRate(avgScore, pointParams.getFullscore());
-                sps.setAvgrate(avgScoreRate);
+                sps.setAvgrate(MarkingUtil.div(avgScore, pointParams.getFullscore()));
                 sps.setAvgscore(avgScore);
             }else{
                 sps.setAvgrate(0.0);
@@ -571,7 +570,7 @@ public class ReportGeneratePointService {
             double schoolSumScore = pointStuScores.stream().mapToDouble(PointStudentVo::getStuscore).sum();
             int stunum = pointStuScores.size();
             double schoolAvgScore = MarkingUtil.div(schoolSumScore, stunum);
-            double schoolScoreRate = MarkingUtil.calculateRate(schoolSumScore, pqvo.getScore() * stunum);
+            double schoolScoreRate = MarkingUtil.div(schoolSumScore, pqvo.getScore() * stunum);
             //处理学生得分情况
             for(PointStudentVo pstuvo : pointStuScores){
                 MsrStudentPoint stuPoint = new MsrStudentPoint();
@@ -582,7 +581,7 @@ public class ReportGeneratePointService {
                 stuPoint.setPointname(pqvo.getPointname());
                 stuPoint.setFullscore(pqvo.getScore());
                 stuPoint.setStuscore(pstuvo.getStuscore());
-                stuPoint.setSturate(MarkingUtil.calculateRate(pstuvo.getStuscore(), pqvo.getScore()));
+                stuPoint.setSturate(MarkingUtil.div(pstuvo.getStuscore(), pqvo.getScore()));
                 stuPoint.setSchoolavg(schoolAvgScore);
                 stuPoint.setSchoolrate(schoolScoreRate);
                 stuPoint.setQns(qnStr.toString());

smarking/src/main/java/com/xhkjedu/smarking/service/report/generate/ReportGenerateQuestionService.java

@@ -163,7 +163,7 @@ public class ReportGenerateQuestionService {
             Double maxScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).max().orElse(0.0);// 最高分
             Double minScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).min().orElse(0.0);// 最低分
             Double avgScore = MarkingUtil.calculateAverage(stuScores);// 平均分
-            Double avgScoreRate = MarkingUtil.calculateRate(avgScore, sumQScore);// 平均得分率
+            Double avgScoreRate = MarkingUtil.div(avgScore, sumQScore);// 平均得分率
 
             MsrClassQuestion schoolQ = new MsrClassQuestion();
             schoolQ.setClassid(0);// 全体班级
@@ -251,9 +251,9 @@ public class ReportGenerateQuestionService {
             maxScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).max().orElse(0.0);// 最高分
             minScore = stuQuestions.stream().mapToDouble(MsPaperStudentQuestion::getStuscore).min().orElse(0.0);// 最低分
             avgScore = MarkingUtil.calculateAverage(stuScores);// 平均分
-            avgScoreRate = MarkingUtil.calculateRate(avgScore, sumQScore);// 平均得分率
+            avgScoreRate = MarkingUtil.div(avgScore, sumQScore);// 平均得分率
         }
-        Double stuScoreRate = MarkingUtil.calculateRate(sumStuScore, sumQScore);// 学生得分率
+        Double stuScoreRate = MarkingUtil.div(sumStuScore, sumQScore);// 学生得分率
         MsrClassQuestion classQ = new MsrClassQuestion();
         classQ.setExamid(schoolQ.getExamid());
         classQ.setSubjectid(schoolQ.getSubjectid());
@@ -275,7 +275,7 @@ public class ReportGenerateQuestionService {
         classQ.setSchoolavgrate(schoolQ.getSchoolavgrate());
 
         classQ.setScorerate(stuScoreRate);
-        classQ.setScoreratec(MarkingUtil.sub(MarkingUtil.calculateRate(maxScore, qScore), MarkingUtil.calculateRate(minScore, qScore)));// 得分率差=最高得分率-最低得分率
+        classQ.setScoreratec(MarkingUtil.sub(MarkingUtil.div(maxScore, qScore), MarkingUtil.div(minScore, qScore)));// 得分率差=最高得分率-最低得分率
         classQ.setNd(MarkingUtil.div(avgScore, qScore));// 难度
         String[] ndStr = questionNdAndQfd(params, 1, classQ.getNd());
         classQ.setNdms(ndStr[0]);// 难度描述
@@ -428,8 +428,8 @@ public class ReportGenerateQuestionService {
                 double avgScore = MarkingUtil.div(sumScore, groupStuQuestions.size());
                 sqr.setStunum(groupStuQuestions.size());
                 sqr.setStuids(groupStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
-                sqr.setScorerate(MarkingUtil.calculateRate(sumScore, groupStuQuestions.size() * fullScore));
-                sqr.setAvgrate(MarkingUtil.calculateRate(avgScore, fullScore));
+                sqr.setScorerate(MarkingUtil.div(sumScore, groupStuQuestions.size() * fullScore));
+                sqr.setAvgrate(MarkingUtil.div(avgScore, fullScore));
             } else {
                 groupStuids = null;
                 sqr.setStunum(0);
@@ -462,8 +462,8 @@ public class ReportGenerateQuestionService {
                         double sectionStuAvgScore = MarkingUtil.div(sectionStuSumScore, sectionStuQuestions.size());
                         sqrg.setStunum(sectionStuQuestions.size());
                         sqrg.setStuids(sectionStuQuestions.stream().map(q -> q.getStudentid().toString()).collect(Collectors.joining(",")));
-                        sqrg.setScorerate(MarkingUtil.calculateRate(sectionStuSumScore, sectionStuQuestions.size() * fullScore));
-                        sqrg.setAvgrate(MarkingUtil.calculateRate(sectionStuAvgScore, fullScore));
+                        sqrg.setScorerate(MarkingUtil.div(sectionStuSumScore, sectionStuQuestions.size() * fullScore));
+                        sqrg.setAvgrate(MarkingUtil.div(sectionStuAvgScore, fullScore));
                     }else{
                         sqrg.setStunum(0);
                         sqrg.setScorerate(0.0);
@@ -580,7 +580,7 @@ public class ReportGenerateQuestionService {
                 // 获取平均分
                 double avgScore = MarkingUtil.div(sumScore, stuNum);
                 // 获取平均得分率
-                double avgScoreRate = MarkingUtil.calculateRate(avgScore, fullScore);
+                double avgScoreRate = MarkingUtil.div(avgScore, fullScore);
                 sqs.setAvgscore(avgScore);
                 sqs.setAvgrate(avgScoreRate);
             }else{

smarking/src/main/java/com/xhkjedu/smarking/service/report/report/MsrClassQuestionService.java

@@ -6,6 +6,7 @@ import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectGradeMapper
 import com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper;
 import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectMapper;
 import com.xhkjedu.smarking.model.exam.MsClass;
+import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
@@ -110,8 +111,43 @@ public class MsrClassQuestionService {
         return msrClassQuestionMapper.listQuestionSummaryForObjsub(params);
     }
 
-    public void listQuestionForXh(ExamReportParams params){
-
+    //学科报告-各班学科试题分析-得分率
+    public void listQuestionForXhScoreRate(ExamReportParams params){
+        params.setSelclass(3);
+        params.setClassids("0," + params.getClassids());//拼上全体
+        //获取选定班级的试题分析
+        List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+        //获取所有题号
+        List<String> qns = questions.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
+        //把试题按班级分组
+        Map<Integer,List<MsrClassQuestion>> classMap = questions.stream().collect(Collectors.groupingBy(MsrClassQuestion::getClassid));
+        List<Map<String,Object>> classList = new ArrayList<>();//班级试题
+        for(Map.Entry<Integer,List<MsrClassQuestion>> entry : classMap.entrySet()){
+            Map<String,Object> clMap = new HashMap<>();
+            clMap.put("classid",entry.getKey());
+            clMap.put("classname",entry.getValue().get(0).getClassname());
+            clMap.put("questions",entry.getValue());
+            classList.add(clMap);
+        }
     }
+    //学科报告-各班学科试题分析-试题难度和区分度
+    public void listQuestionForXhNdAndQfd(ExamReportParams params){
+        params.setSelclass(4);
+        //获取选定班级的试题分析
+        List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+        //获取所有题号
+        List<String> qns = questions.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
+        //把试题按班级分组
+        Map<Integer,List<MsrClassQuestion>> classMap = questions.stream().collect(Collectors.groupingBy(MsrClassQuestion::getClassid));
+        List<Map<String,Object>> classList = new ArrayList<>();//班级试题
+        for(Map.Entry<Integer,List<MsrClassQuestion>> entry : classMap.entrySet()){
+            Map<String,Object> clMap = new HashMap<>();
+            clMap.put("classid",entry.getKey());
+            clMap.put("classname",entry.getValue().get(0).getClassname());
+            clMap.put("questions",entry.getValue());
+            classList.add(clMap);
+        }
+    }
+
 
 }

smarking/src/main/resources/mapper/paper/MsPaperQtypeMapper.xml

@@ -15,6 +15,7 @@
         <result column="mptname" property="mptname" />
         <result column="mptnum" property="mptnum" />
         <result column="mptorder" property="mptorder" />
+        <result column="mptctype" property="ctype" />
         <result column="mptscore" property="mptscore" />
         <collection property="questions" ofType="com.xhkjedu.smarking.vo.paper.MsPaperQtypeQuestionVo" javaType="java.util.List">
             <result column="mptqid" property="mptqid" />
@@ -61,7 +62,7 @@
     </resultMap>
     <!--试题详情-->
     <select id="listPaperQtypeQuestions" resultMap="qtypesQuestion">
-        select t.mptid,t.mpid,t.mptqn,t.mptname,t.mptnum,t.mptorder,t.mptscore,tq.mptqid,tq.questionid,tq.questionpid,tq.qanswer as answer,tq.qscore,tq.qn,
+        select t.mptid,t.mpid,t.mptqn,t.mptname,t.mptnum,t.mptorder,t.ctype as mptctype ,t.mptscore,tq.mptqid,tq.questionid,tq.questionpid,tq.qanswer as answer,tq.qscore,tq.qn,
         tq.qorder,tq.loseoption,tq.scoreset,COALESCE(tq.complexity, q.complexity) as complexity,q.qtypeid,q.qtypename,q.ctype qctype,
         q.qstem,q.qstemtxt,q.qoption,q.qanswer,q.qanalyze,q.hashear,q.hearfile,q.qlevel,q.sorder,
         fq.snum,fq.qstem as mqstem,fq.complexity as mcomplexity,fq.qtypeid mqtypeid,fq.qtypename mqtypename,fq.ctype mctype,

smarking/src/main/resources/mapper/report/reportclass/MsrClassQuestionMapper.xml

@@ -93,11 +93,15 @@
     <!--学科报告-各班学科试题分析-->
     <select id="listQuestionForXh" resultType="com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion">
         select q.mptqid,q.classid,q.qn,q.qtype,
-        q.classavgrate,q.schoolavgrate,q.scorerate,q.scoreratec,q.qfd,q.qfdms,c.classname
+        q.classavgrate,q.schoolavgrate,q.scorerate,q.scoreratec,q.nd,q.ndms,q.qfd,q.qfdms,c.classname
         from msr_class_question q left join ms_class c on q.examid=c.examid
         and q.subjectid=c.subjectid and q.classid=c.classid
-        where q.examid=#{param.examid} and q.subjectid=#{param.subjectid} and q.classid in
-        <foreach collection="param.classids" item="item" open="(" separator="," close=")">#{item}</foreach>
+        where q.examid=#{param.examid} and q.subjectid=#{param.subjectid}
+        <if test="param.selclass == 3">
+            and q.classid in
+            <foreach collection="param.classids" item="item" open="(" separator="," close=")">#{item}</foreach>
+        </if>
+        <if test="param.selclass == 4"> and q.classid = #{param.classid}</if>
         order by q.mptqid
     </select>