完善模板、班级试题学生试题

smarking/src/main/java/com/xhkjedu/smarking/controller/report/BjReportController.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.smarking.controller.report;
+
+import com.xhkjedu.smarking.service.report.report.MsrClassQuestionService;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description：班级报告
+ * @Author: WN
+ * @Date: 2024/12/30 10:33:37
+ **/
+@RestController
+@RequestMapping("/rbj")
+public class BjReportController {
+    @Resource
+    private MsrClassQuestionService msrClassQuestionService;
+
+
+
+    /*
+     * @Description 全部班级-学科试题得分率对比
+     * @Date 2024/12/30 10:35:09
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/qbbj_xkst")
+    public ResultVo listQuestionForBjQuestionScoreRate(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForBjQuestionScoreRate(params));
+    }
+
+
+    /*
+     * @Description 单个班级-学科试题考试内在表现
+     * @Date 2024/12/30 11:22:42
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/dgb_stks")
+    public ResultVo listQuestionForBjStks(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2,params.getClassid(),"班级id",1});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForBjStks(params));
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/controller/report/MtzlReportController.java

@@ -0,0 +1,39 @@
+package com.xhkjedu.smarking.controller.report;
+
+import com.xhkjedu.smarking.service.report.report.MsrClassQuestionService;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description：命题质量报告
+ * @Author: WN
+ * @Date: 2024/12/30 17:00:47
+ **/
+@RestController
+@RequestMapping("/rmtzl")
+public class MtzlReportController {
+    @Resource
+    private MsrClassQuestionService msrClassQuestionService;
+
+
+    /*
+     * @Description 命题分析-试题分析指标明细表
+     * @Date 2024/12/30 17:01:56
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/mtfx_stfx")
+    public ResultVo listMtzlMtfxQuestions(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listMtzlStfxQuestions(params));
+    }
+
+}

smarking/src/main/java/com/xhkjedu/smarking/controller/report/XkReportController.java

@@ -23,7 +23,7 @@ public class XkReportController {
     private MsrClassQuestionService msrClassQuestionService;
 
     /*
-     * @Description 各班学科试题分析-得分率
+     * @Description 各班学科试题分析-得分率,得分率差异对比
      * @Date 2024/12/27 15:42:52
      * @Author WN
      * @Param [params]
@@ -34,4 +34,30 @@ public class XkReportController {
         N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2,params.getClassids(),"班级id",2});
         return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForXhXhstDfl(params));
     }
+
+    /*
+     * @Description 各班学科试题分析-区分度，得分率差
+     * @Date 2024/12/30 10:13:10
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/xkst_qfd")
+    public ResultVo listQuestionForXhXhstQfd(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2,params.getClassid(),"班级id",1});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForXhXhstQfd(params));
+    }
+
+    /*
+     * @Description 各班学科试题分析-难度分组表现差异
+     * @Date 2024/12/30 10:24:14
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/xkst_Nd")
+    public ResultVo listQuestionForXhXhstNdGroup(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForXhXhstNdGroup(params));
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/controller/report/XsReportController.java

@@ -0,0 +1,52 @@
+package com.xhkjedu.smarking.controller.report;
+
+import com.xhkjedu.smarking.service.report.report.MsrStudentService;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Description：学生报告
+ * @Author: WN
+ * @Date: 2024/12/30 16:10:55
+ **/
+@RestController
+@RequestMapping("/rxs")
+public class XsReportController {
+    @Resource
+    private MsrStudentService msrStudentService;
+
+
+
+    /*
+     * @Description 学生各学科试题分析
+     * @Date 2024/12/30 16:12:23
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/stfx")
+    public ResultVo listQuestionForBjQuestionScoreRate(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2,params.getStudentid(),"学生id",1});
+        return new ResultVo(0,"获取成功",msrStudentService.listStuSubjectQuestions(params));
+    }
+
+    /*
+     * @Description 学生各学科知识点分析
+     * @Date 2024/12/30 16:25:27
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/zsdfx")
+    public ResultVo listStuPoints(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2,params.getStudentid(),"学生id",1});
+        return new ResultVo(0,"获取成功",msrStudentService.listStuPoints(params));
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportclass/MsrClassQuestionMapper.java

@@ -32,4 +32,6 @@ public interface MsrClassQuestionMapper extends TkMapper<MsrClassQuestion> {
     List<Map<String, Object>> listQuestionSummaryForObjsub(@Param("param") ExamReportParams param);
     //学科报告-各班学科试题分析
     List<MsrClassQuestion> listQuestionForXh(@Param("param") ExamReportParams param);
+    //命题质量-命题分析-试题分析指标明细表
+    List<Map<String,Object>> listMtzlMtfxQuestions(@Param("param") ExamReportParams param);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportstu/MsrStudentMapper.java

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.report.reportstu;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -19,4 +20,6 @@ public interface MsrStudentMapper extends TkMapper<MsrStudent> {
     void updateBatchObjSubScore(@Param("list") List<MsrStudent> list);
     //综合报告-小分表-学生分数排名
     List<Map<String, Object>> listStuScoreAndRankByExamidAndSubjectid(@Param("examid") int examid, @Param("subjectid") String subjectid);
+    //学生报告-学生学科试题分析
+    List<Map<String, Object>> listStuSubjectQuestions(@Param("params") ExamReportParams params);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportstu/MsrStudentPointMapper.java

@@ -2,6 +2,11 @@ package com.xhkjedu.smarking.mapper.report.reportstu;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudentPoint;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-学生各科知识点分析表 Mapper 接口
@@ -9,4 +14,7 @@ import com.xhkjedu.smarking.model.report.reportstu.MsrStudentPoint;
  * @Date 2024-12-09
  */
 public interface MsrStudentPointMapper extends TkMapper<MsrStudentPoint> {
+
+    //学生报告-学生学科知识点分析
+    List<Map<String, Object>> listStuPoints(@Param("params") ExamReportParams params);
 }

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

@@ -37,6 +37,8 @@ public class MsPaperQtypeQuestion extends BaseBean {
     private String qtypename;
     //题号
     private String qn;
+    //题号拼接大题
+    private String qnstr;
     //试题分值
     private Double qscore;
     //试题排序

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportstu/MsrStudentPoint.java

@@ -40,5 +40,5 @@ public class MsrStudentPoint extends BaseBean {
     //知识点对应试题题号
     private String qns;
     //知识点对应试题ID
-    private String mptqid;
+    private String mptqids;
 }

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

@@ -207,7 +207,7 @@ public class MsPaperQtypeService {
                 } else {
                     q.setQtype(2);
                 }
-
+                q.setQnstr(qtype.getMptqn() + "." + q.getQn());
 
                 qtqs.add(q);
             }
@@ -1287,6 +1287,7 @@ public class MsPaperQtypeService {
             } else {
                 que.setQtype(2);
             }
+            que.setQnstr(paperQtype.getMptqn() + "." + que.getQn());
             if(que.getScoreset() == null) que.setScoreset(0);
             if(que.getLoseoption() == null) que.setLoseoption(0.0);
         }
@@ -1307,7 +1308,6 @@ public class MsPaperQtypeService {
             // 更改科目状态
             msSubjectMapper.updatePstateByMpid(mpid, 2);
         }
-
         deletePaperOtherInfo(mpid);
 
         return new ResultVo(0, "保存成功", paper.getMpid());
@@ -1368,6 +1368,7 @@ public class MsPaperQtypeService {
             }
             if(que.getScoreset() == null) que.setScoreset(0);
             if(que.getLoseoption() == null) que.setLoseoption(0.0);
+            que.setQnstr(paperQtype.getMptqn() + "." + que.getQn());
         }
         msPaperQtypeQuestionMapper.insertList(qtypeQuestions);
 

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

@@ -444,7 +444,7 @@ public class ReportGeneratePointService {
     //层级知识点分析--顶层和上层知识点是知识点本身
     private void pointTopAndUpForSelf(PointLevelVo firstPoint,Integer pointlevel,Map<String, List<MsrSubjectPoint>> subjectPointMap,
             Map<String, List<MsrSubjectPointSection>> pointSectionMap,Map<String, List<MsrSubjectPointRankgroup>> pointRankgroupMap,
-            List<MsrSubjectPoint> saveSubjectPoints,List<MsrSubjectPointSection> savePointSections, List<MsrSubjectPointRankgroup> savePointRankgroups) throws Exception {
+            List<MsrSubjectPoint> saveSubjectPoints,List<MsrSubjectPointSection> savePointSections, List<MsrSubjectPointRankgroup> savePointRankgroups) {
 
         //知识点分析
         List<MsrSubjectPoint> subpoints = subjectPointMap.get(firstPoint.getPointid());
@@ -585,7 +585,7 @@ public class ReportGeneratePointService {
                 stuPoint.setSchoolavg(schoolAvgScore);
                 stuPoint.setSchoolrate(schoolScoreRate);
                 stuPoint.setQns(qnStr.toString());
-                stuPoint.setMptqid(mptqidStr);
+                stuPoint.setMptqids(mptqidStr);
                 saveStuPoints.add(stuPoint);
             }
         }

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

@@ -10,6 +10,7 @@ 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.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
 import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
 import com.xhkjedu.utils.N_Utils;
@@ -208,10 +209,6 @@ public class MsrClassQuestionService {
 
             ndList.add(zsndMap);
         }
-        //计算各个难度的试题得分率
-        for(Map<String,Object> nd : ndList) {
-            List<MsrClassQuestion> ndQuestions = schoolQuestions.stream().filter(m -> m.getNdms().equals(nd.get("ndms"))).collect(Collectors.toList());
-        }
 
         Map<String,Object> rtnMap = new LinkedHashMap<>();
         rtnMap.put("qns",qns);
@@ -222,7 +219,7 @@ public class MsrClassQuestionService {
         return rtnMap;
     }
     //学科报告-各班学科试题分析-试题难度和区分度
-    public void listQuestionForXhXhstNdAndQfd(ExamReportParams params){
+    public Map<String,Object> listQuestionForXhXhstQfd(ExamReportParams params){
         params.setSelclass(4);
         //获取选定班级的试题分析
         List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
@@ -239,21 +236,193 @@ public class MsrClassQuestionService {
         // 获取后N个元素
         lastN = goodAndBadQues.stream().skip(goodAndBadQues.size() - n).collect(Collectors.toList());
 
-        
+        //统计图按区分度进行排序
+        List<MsrClassQuestion> qfdQuestions = questions.stream().sorted(Comparator.comparing(MsrClassQuestion::getQfd).reversed()).collect(Collectors.toList());
+        List<Map<String,Object>> qfdList = new ArrayList<>();
+        for(MsrClassQuestion qfd : qfdQuestions){
+            Map<String,Object> qfdMap = new HashMap<>();
+            qfdMap.put("qn",qfd.getQn());
+            qfdMap.put("mptqid",qfd.getMptqid());    // 题目ID
+            qfdMap.put("qfd",qfd.getQfd());
+            qfdMap.put("scorerate",qfd.getScorerate());
+            qfdMap.put("scoreratec",qfd.getScoreratec());
+            qfdList.add(qfdMap);
+        }
 
-        //获取所有题号
-        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);
+        Map<String,Object> rtnMap = new HashMap<>();
+        rtnMap.put("firstN",firstN);
+        rtnMap.put("lastN",lastN);
+        rtnMap.put("qfdList",qfdList);
+        return rtnMap;
+    }
+    //学科报告-各班学科试题分析-试题难度分组表现差异
+    public Map<String,Object> listQuestionForXhXhstNdGroup(ExamReportParams params){
+        //所有所有试题
+        List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+
+        //获取考试关联班级
+        List<MsClass> classList= msClassMapper.listClassByExamidAndSubjectid(params.getExamid(),params.getSubjectid());
+
+        //获取所有试题难度分组参数
+        MsrReportparam ndParam = msrReportparamMapper.getReportparamByRpbelongSubjectType(params.getExamid(),"quesummary","all",params.getSubjectid(),1);
+        List<SzJsonVo> jsonList = JSON.parseArray(ndParam.getSzjson(), SzJsonVo.class);
+        List<Map<String,Object>> ndList = new ArrayList<>();
+        List<String> ndfwList = new ArrayList<>();
+        for(SzJsonVo szvo : jsonList){
+            Map<String,Object> zsndMap = new HashMap<>();
+            zsndMap.put("djkey",szvo.getDjkey());
+            ndfwList.add(szvo.getDjkey());
+            zsndMap.put("classid",0);
+            zsndMap.put("classname","全体");
+            //获取该难度下所有试题
+            List<MsrClassQuestion> ndQues = questions.stream().filter(m -> m.getNdms().equals(szvo.getDjkey())).collect(Collectors.toList());
+            //处理全体班级情况
+            List<MsrClassQuestion> schoolQues = ndQues.stream().filter(m -> m.getClassid() == 0).collect(Collectors.toList());
+            if(schoolQues.isEmpty()){
+                //获取
+                zsndMap.put("qnstr", "");
+                zsndMap.put("scorerate", 0);
+            }else{
+                //获取
+                List<String> qnList = schoolQues.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
+                double sumScoreRate = schoolQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
+                zsndMap.put("qnstr", String.join(",", qnList));
+                zsndMap.put("scorerate", MarkingUtil.div(sumScoreRate,qnList.size()));
+            }
+            ndList.add(zsndMap);
+            //处理各班情况
+            for(MsClass cl : classList){
+                List<MsrClassQuestion> classQues = ndQues.stream().filter(m -> Objects.equals(m.getClassid(), cl.getClassid())).collect(Collectors.toList());
+
+                Map<String,Object> classNdMap = new HashMap<>();
+                classNdMap.put("djkey",szvo.getDjkey());
+                classNdMap.put("classid",cl.getClassid());
+                classNdMap.put("classname",cl.getClassname());
+                if(classQues.isEmpty()){
+                    classNdMap.put("qnstr", "");
+                    classNdMap.put("scorerate", 0);
+                }else{
+                    List<String> classqnList = classQues.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
+                    double classScoreRate = classQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
+                    classNdMap.put("qnstr", String.join(",", classqnList));
+                    classNdMap.put("scorerate",MarkingUtil.div(classScoreRate, classqnList.size()));
+                }
+                ndList.add(classNdMap);
+            }
+        }
+        Map<String,Object> rtnMap = new HashMap<>();
+        rtnMap.put("ndfwList",ndfwList);
+        rtnMap.put("ndList",ndList);
+        return rtnMap;
+    }
+
+    //班级报告-全部班级-学科试题得分率对比
+    public Map<String,Object> listQuestionForBjQuestionScoreRate(ExamReportParams params){
+        //获取考试关联班级
+        List<MsClass> classList= msClassMapper.listClassByExamidAndSubjectid(params.getExamid(),params.getSubjectid());
+        //所有所有试题
+        List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+        //返回所有的班级信息
+        List<Map<String,Object>> classListMap = new ArrayList<>();
+        Map<String,Object> schoolMap = new HashMap<>();
+        schoolMap.put("classid",0);
+        schoolMap.put("classname","全体");
+        classListMap.add(schoolMap);
+
+        for(MsClass cl : classList) {
+            Map<String,Object> classMap = new HashMap<>();
+            classMap.put("classid",cl.getClassid());
+            classMap.put("classname",cl.getClassname());
+            classListMap.add(classMap);
+        }
+        //把试题按试题id分组
+        Map<Integer,List<MsrClassQuestion>> qnMap = questions.stream().collect(Collectors.groupingBy(MsrClassQuestion::getMptqid));
+        List<Map<String,Object>> quesList = new ArrayList<>();
+        for(Map.Entry<Integer,List<MsrClassQuestion>> entry : qnMap.entrySet()) {
+            List<MsrClassQuestion> entryList = entry.getValue();
+            Map<String,Object> queMap = new HashMap<>();
+            queMap.put("qn",entryList.get(0).getQn());
+            List<Map<String,Object>> classQueList = new ArrayList<>();
+            for(Map<String,Object> cmap : classListMap){
+                int classid = (int)cmap.get("classid");
+                Map<String,Object> classMap = new HashMap<>();
+                classMap.put("classid",classid);
+                MsrClassQuestion classQues = entryList.stream().filter(m -> m.getClassid() == classid).findFirst().orElse(null);
+                if(classQues!= null){
+                    classMap.put("scorerate",classQues.getScorerate());
+                }else{
+                    classMap.put("scorerate",0);
+                }
+                classQueList.add(classMap);
+            }
+            queMap.put("questions",classQueList);
+            quesList.add(queMap);
+        }
+
+        Map<String,Object> rtnMap = new HashMap<>();
+        rtnMap.put("questions",quesList);
+        rtnMap.put("classList",classListMap);
+        return rtnMap;
+    }
+    //班级报告-单个班级-学科试题考试内在表现
+    public Map<String,Object> listQuestionForBjStks(ExamReportParams params){
+
+        //类似学科报告，获取数据
+        Map<String,Object> rtnMap = listQuestionForXhXhstQfd(params);
+
+        //所有选择的班级和年级的试题情况
+        params.setSelclass(3);
+        Integer classid = params.getClassid();
+        params.setClassids("0," + params.getClassid());
+        List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+
+        //获取所有试题难度分组参数
+        MsrReportparam ndParam = msrReportparamMapper.getReportparamByRpbelongSubjectType(params.getExamid(),"quesummary","all",params.getSubjectid(),1);
+        List<SzJsonVo> jsonList = JSON.parseArray(ndParam.getSzjson(), SzJsonVo.class);
+        List<Map<String,Object>> ndList = new ArrayList<>();
+        for(SzJsonVo szvo : jsonList){
+            Map<String,Object> zsndMap = new HashMap<>();
+            zsndMap.put("djkey",szvo.getDjkey());
+            //获取该难度下所有试题
+            List<MsrClassQuestion> ndQues = questions.stream().filter(m -> m.getNdms().equals(szvo.getDjkey())).collect(Collectors.toList());
+            //处理全体班级情况
+            List<MsrClassQuestion> schoolQues = ndQues.stream().filter(m -> m.getClassid() == 0).collect(Collectors.toList());
+            if(schoolQues.isEmpty()){
+                zsndMap.put("schoolscorerate", 0);
+            }else{
+                //获取年级的
+                List<String> qnList = schoolQues.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
+                double sumScoreRate = schoolQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
+                zsndMap.put("schoolscorerate", MarkingUtil.div(sumScoreRate,qnList.size()));
+            }
+
+            //获取班级的情况
+            List<MsrClassQuestion> classQues = ndQues.stream().filter(m -> m.getClassid().equals(classid)).collect(Collectors.toList());
+            if(classQues.isEmpty()){
+                zsndMap.put("classscorerate", 0);
+            }else{
+                List<String> qnList = schoolQues.stream().map(MsrClassQuestion::getQn).distinct().collect(Collectors.toList());
+                double classScoreRate = schoolQues.stream().mapToDouble(MsrClassQuestion::getScorerate).sum();
+                zsndMap.put("classscorerate",MarkingUtil.div(classScoreRate,qnList.size()));
+            }
+
+            ndList.add(zsndMap);
         }
+        rtnMap.put("ndList",ndList);
+        return rtnMap;
+    }
+
+    //命题质量报告-命题分析-试题分析指标明细表
+    public List<Map<String,Object>> listMtzlStfxQuestions(ExamReportParams params){
+        return  msrClassQuestionMapper.listMtzlMtfxQuestions(params);
     }
 
+    //命题质量报告-命题分析-试题难度分布结构表
+    public void listMtzlStnds(ExamReportParams params){
+        //获取本学科整体难度
+        params.setSelclass(4);
+        params.setClassid(0);
+        List<MsrClassQuestion> questions = msrClassQuestionMapper.listQuestionForXh(params);
+    }
 
 }

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

@@ -1,6 +1,8 @@
 package com.xhkjedu.smarking.service.report.report;
 
 import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentMapper;
+import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentPointMapper;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -16,9 +18,23 @@ import java.util.Map;
 public class MsrStudentService {
     @Resource
     private MsrStudentMapper msrStudentMapper;
+    @Resource
+    private MsrStudentPointMapper msrStudentPointMapper;
 
     //综合报告-小分表-列表
     public List<Map<String,Object>> listStuScoreAndRank(Integer examid, String subjectid){
         return msrStudentMapper.listStuScoreAndRankByExamidAndSubjectid(examid,subjectid);
     }
+
+    //学生报告-学生各学科试题分析
+    public List<Map<String,Object>> listStuSubjectQuestions(ExamReportParams params){
+        return msrStudentMapper.listStuSubjectQuestions(params);
+    }
+
+    //学生报告-学生各学科知识点分析
+    public List<Map<String,Object>> listStuPoints(ExamReportParams params){
+        return msrStudentPointMapper.listStuPoints(params);
+    }
+
+
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportother/ExamReportParams.java

@@ -19,4 +19,6 @@ public class ExamReportParams {
     private Integer classid;//班级ID
 
     private String classids;//多个班级id
+
+    private Integer studentid;//学生ID
 }

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

@@ -143,6 +143,7 @@
             <result column="qorder" property="qorder" />
             <result column="ctype" property="ctype" />
             <result column="qn" property="qn" />
+            <result column="qnstr" property="qnstr" />
             <result column="qanswer" property="qanswer" />
             <result column="optionnum" property="optionnum" />
             <result column="loseoption" property="loseoption" />
@@ -152,7 +153,7 @@
     </resultMap>
     <select id="listSubjectiveQuestionsFj" resultMap="subjectiveQuestions">
         select t.mptid,t.mptqn,t.mptname,t.mptnum,t.mptorder,t.mptscore,
-        q.mptqid,q.qtypeid,q.qtypename,q.ctype,q.qscore,q.qn,q.qorder,q.qanswer,q.optionnum,q.loseoption,q.scoreset
+        q.mptqid,q.qtypeid,q.qtypename,q.ctype,q.qscore,q.qn,q.qnstr,q.qorder,q.qanswer,q.optionnum,q.loseoption,q.scoreset
         from ms_paper_qtype_question q left join ms_paper_qtype t on t.mptid=q.mptid
         where t.mpid=#{mpid}
         <if test="qtype!=null and qtype!=0"> and q.qtype=#{qtype}</if>
@@ -161,7 +162,7 @@
 
     <select id="listSubjectiveQuestionsTk" resultMap="subjectiveQuestions">
         select t.mptid,t.mptqn,t.mptname,t.mptnum,t.mptorder,t.mptscore,q.mptqid,
-        q.ctype,q.qscore,q.qn,q.qorder,q.qanswer,q.optionnum,q.loseoption,q.scoreset,q2.sorder
+        q.ctype,q.qscore,q.qn,qnstr,q.qorder,q.qanswer,q.optionnum,q.loseoption,q.scoreset,q2.sorder
         from ms_paper_qtype_question q left join ms_paper_qtype t on t.mptid=q.mptid
         left join t_question q2 on q.questionid=q2.questionid
         where t.mpid=#{mpid}

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

@@ -66,8 +66,9 @@
     <select id="listBlockTemplates" resultMap="blockTemplate">
         select DISTINCT b.mblockid,b.blockname,b.blockorder,b.bqnum,b.bqscore,
                         tb.localcoor,tb.pagenum,tb.extendcoor,tb.scorecoor,bq.mbqid,bq.bqn
-        from ms_paper_block b inner join ms_template_block tb on b.mblockid=tb.mblockid
+        from ms_paper_block b left join ms_template_block tb on b.mblockid=tb.mblockid
+        left join ms_template t on b.mpid=t.mpid
         left join ms_paper_block_question bq on b.mblockid=bq.mblockid
-        where b.mpid=#{mpid} and tb.mtid=#{mtid} and b.blocktype=2 order by b.blockorder,bq.bqorder
+        where b.mpid=#{mpid} and b.blocktype=2 and t.mtid=#{mtid} order by b.blockorder,bq.bqorder
     </select>
 </mapper>

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

@@ -4,7 +4,7 @@
 
     <!--根据msid查询试卷模板列表-->
     <select id="listTemplatesByMpid" resultType="java.util.Map">
-        select t.mtid,t.mpid,t.currstep,t.tstate,t.createtime from ms_template t
+        select t.mtid,t.mpid,t.currstep,t.tstate,t.createtime,t.tfront,t.tback from ms_template t
         left join ms_paper p on t.mpid=p.mpid
         where p.mpid=#{mpid} order by t.createtime desc
     </select>

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

@@ -93,7 +93,7 @@
     <!--学科报告-各班学科试题分析-->
     <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.nd,q.ndms,q.qfd,q.qfdms,c.classname
+        q.classavgrate,q.schoolavgrate,q.scorerate,q.scoreratec,q.nd,q.ndms,q.ndfw,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}
@@ -105,5 +105,13 @@
         order by q.mptqid
     </select>
 
+    <!--命题质量-命题分析-试题分析指标明细表-->
+    <select id="listMtzlMtfxQuestions" resultType="java.util.Map">
+        select cq.cqid,cq.mptqid,cq.qn,cq.qorder,cq.qtype,cq.fullscore,cq.stunum,cq.schoolmaxscore,
+        cq.schoolminscore,cq.schoolavgscore,cq.nd,cq.bzc,cq.cyxs,cq.qfd,cq.jbzs,cq.lfnum,
+        cq.lfrate,cq.mfnum,cq.mfrate from msr_class_question cq where cq.examid=#{param.examid}
+        and cq.subjectid=#{param.subjectid} and cq.classid=0 order by cqid
+    </select>
+
 
 </mapper>

smarking/src/main/resources/mapper/report/reportstu/MsrStudentMapper.xml

@@ -53,4 +53,15 @@
         where s.examid=#{examid} and s.subjectid=#{subjectid}
         order by s.schoolrank,s.rsid,qt.mptorder,q.qorder
     </select>
+
+    <!--学生报告-学生学科试题分析-->
+    <select id="listStuSubjectQuestions" resultType="java.util.Map">
+        select distinct q.mpsqid,q.mptqid,q.qn,q.qscore,q.stuscore,q.ctype,q.stuanswer,
+        cq.schoolavgscore,cq.scorerate
+        from ms_paper_student_question q
+        left join msr_class_question cq on q.examid=cq.examid and q.subjectid=cq.subjectid
+            and q.mptqid=cq.mptqid and cq.classid=0
+        where q.examid=#{params.examid} and q.subjectid=#{params.subjectid} and q.studentid=#{params.studentid}
+        order by q.mptqid
+    </select>
 </mapper>

smarking/src/main/resources/mapper/report/reportstu/MsrStudentPointMapper.xml

@@ -1,4 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentPointMapper">
+
+    <!--学生报告-学生学科知识点分析-->
+    <select id="listStuPoints" resultType="java.util.Map">
+        select pointid,pointname,fullscore,stuscore,sturate,schoolavg,schoolrate,qns,mptqids
+        from msr_student_point where examid=#{params.examid} and subjectid=#{params.subjectid} and studentid=#{params.studentid} order by spid
+    </select>
+
 </mapper>