校级报告试题分析

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

@@ -0,0 +1,14 @@
+package com.xhkjedu.smarking.controller.report;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description：学科报告
+ * @Author: WN
+ * @Date: 2024/12/24 17:36:06
+ **/
+@RestController
+@RequestMapping("/rxk")
+public class XkReportController {
+}

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

@@ -0,0 +1,108 @@
+package com.xhkjedu.smarking.controller.report;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.smarking.model.exam.MsSubject;
+import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade;
+import com.xhkjedu.smarking.service.report.report.MsrClassQuestionService;
+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.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+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;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description：综合报告
+ * @Author: WN
+ * @Date: 2024/12/24 9:25:37
+ **/
+@RestController
+@RequestMapping("/rzh")
+public class ZhReportController {
+
+    @Resource
+    private MsrStudentService msrStudentService;
+    @Resource
+    private MsrClassQuestionService msrClassQuestionService;
+
+    /*
+     * @Description 校级报告-小分表-列表
+     * @Date 2024/12/24 10:25:06
+     * @Author WN
+     * @Param [subject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/xfb")
+    public ResultVo listStudentForxfb(@RequestBody MsSubject subject){
+        Integer page = subject.getPage();
+        Integer pageSize = subject.getPageSize();
+        N_Utils.validation(new Object[]{subject.getExamid(),"考试id",1,subject.getSubjectid(),"科目id",2,page,"显示页码",1,pageSize,"显示条数",1});
+        PageHelper.startPage(page, pageSize);
+        List<Map<String,Object>> rtnlst = msrStudentService.listStuScoreAndRank(subject.getExamid(), subject.getSubjectid());
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(rtnlst));
+        return new ResultVo(0,"获取成功",pageResult);
+    }
+
+    /*
+     * @Description 校级报告-试题汇总-全部班-科目情况
+     * @Date 2024/12/24 14:47:43
+     * @Author WN
+     * @Param [subject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/sthz_qbb_km")
+    public ResultVo getSubjectSummary(@RequestBody MsrClassSubjectGrade subject){
+        N_Utils.validation(new Object[]{subject.getExamid(),"考试id",1,subject.getSubjectid(),"科目id",2});
+        Map<String,Object> rtnMap = msrClassQuestionService.getSubjectForAllSmall(subject);
+        return new ResultVo(0,"获取成功",rtnMap);
+    }
+
+    /*
+     * @Description 综合报告-试题汇总表-全部分类-按小题分析
+     * @Date 2024/12/24 15:46:14
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/sthz_q")
+    public ResultVo listQuestionForAllSmall(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForAllSmall(params));
+    }
+
+    /*
+     * @Description 综合报告-试题汇总表-全部分类-按大题分析
+     * @Date 2024/12/24 17:19:02
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/sthz_qt")
+    public ResultVo listQuestionForAllQtype(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForAllQtype(params));
+    }
+
+    /*
+     * @Description 综合报告-试题汇总表-全部分类-按主(客)题分析
+     * @Date 2024/12/24 17:27:44
+     * @Author WN
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/sthz_os")
+    public ResultVo listQuestionForAllObjsub(@RequestBody ExamReportParams params){
+        N_Utils.validation(new Object[]{params.getExamid(),"考试id",1,params.getSubjectid(),"科目id",2});
+        return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForAllObjsub(params));
+    }
+
+}

smarking/src/main/java/com/xhkjedu/smarking/mapper/exam/MsClassMapper.java

@@ -51,4 +51,6 @@ public interface MsClassMapper extends TkMapper<MsClass> {
 
     //获取考试关联班级
     List<MsClass> listClassByExamId(@Param("examid") Integer examid);
+    //考试科目关联不安及
+    List<MsClass> listClassByExamidAndSubjectid(@Param("examid") Integer examid, @Param("subjectid") String subjectid);
 }

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

@@ -2,9 +2,11 @@ package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassQuestion;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-班级试题小题分析表 Mapper 接口
@@ -21,4 +23,13 @@ public interface MsrClassQuestionMapper extends TkMapper<MsrClassQuestion> {
     void updateBatchNdById(@Param("list") List<MsrClassQuestion> list);
     //修改区分度
     void updateBatchQfdById(@Param("list") List<MsrClassQuestion> list);
+
+    //综合报告-试题汇总表-全部班级-按小题分析
+    List<Map<String, Object>> listQuestionSummaryForSmall(@Param("param") ExamReportParams param);
+    //综合报告-试题汇总表-全部班级-按大题分析
+    List<Map<String, Object>> listQuestionSummaryForQtype(@Param("param") ExamReportParams param);
+    //综合报告-试题汇总表-全部分类-按主(客)题分析
+    List<Map<String, Object>> listQuestionSummaryForObjsub(@Param("param") ExamReportParams param);
+    //学科报告-各班学科试题分析
+    List<MsrClassQuestion> listQuestionForXh(@Param("param") ExamReportParams param);
 }

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

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 阅卷报告-班级学科四率等级分析表 Mapper 接口
@@ -9,4 +12,7 @@ import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade;
  * @Date 2024-12-09
  */
 public interface MsrClassSubjectGradeMapper extends TkMapper<MsrClassSubjectGrade> {
+
+    //综合报告-试题汇总表-全部班级-科目情况-四率等级分析
+    List<MsrClassSubjectGrade> listSubjectGrade(@Param("sg")MsrClassSubjectGrade sg);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportother/MsrReportparamMapper.java

@@ -15,6 +15,8 @@ public interface MsrReportparamMapper extends TkMapper<MsrReportparam> {
 
     //获取考试指定图例对应参数
     List<MsrReportparam> listReportparamByRpbelong(@Param("examid") Integer examid, @Param("rpbelong") String rpbelong, @Param("reportcode") String reportcode);
+    //获取指定科目参数
+    MsrReportparam getReportparamByRpbelongSubject(@Param("examid") Integer examid, @Param("rpbelong") String rpbelong, @Param("reportcode") String reportcode, @Param("subjectid") String subjectid);
 
     //批量删除
     int deleteBatchReportparam(@Param("list") List<Integer> list);

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

@@ -5,6 +5,7 @@ import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-学生成绩分析表 Mapper 接口
@@ -16,4 +17,6 @@ public interface MsrStudentMapper extends TkMapper<MsrStudent> {
     List<MsrStudent> listStuScoreAndRankByExamid(@Param("examid") int examid);
     //批量修改学生主观题、客观题分值
     void updateBatchObjSubScore(@Param("list") List<MsrStudent> list);
+    //综合报告-小分表-学生分数排名
+    List<Map<String, Object>> listStuScoreAndRankByExamidAndSubjectid(@Param("examid") int examid, @Param("subjectid") String subjectid);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportsubject/MsrSubjectMapper.java

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.report.reportsubject;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-科目分析表 Mapper 接口
@@ -9,4 +12,7 @@ import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
  * @Date 2024-12-09
  */
 public interface MsrSubjectMapper extends TkMapper<MsrSubject> {
+
+    //综合报告-试题汇总表-全部班级-科目情况
+    Map<String, Object> getSubjectBaseInfo(@Param("examid")Integer examid, @Param("subjectid")String subjectid);
 }

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

@@ -27,6 +27,8 @@ public class MsrClassQuestion extends BaseBean {
     private Integer mptqid;
     //题号
     private String qn;
+    //试题排序
+    private Integer qorder;
     //试题类型（1客观题 2主观题）
     private Integer qtype;
     //满分

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

@@ -174,6 +174,7 @@ public class ReportGenerateQuestionService {
             schoolQ.setSchoolavgscore(avgScore);
             schoolQ.setSchoolavgrate(avgScoreRate);
             schoolQ.setMptqid(question.getMptqid());
+            schoolQ.setQorder(question.getQorder());
             schoolQ.setZqda(question.getQanswer());
             schoolQ.setQn(question.getMptqn() + "." + question.getQn());
             // 全校班级试题情况
@@ -260,6 +261,7 @@ public class ReportGenerateQuestionService {
         classQ.setMptqid(question.getMptqid());
         classQ.setQtype(question.getQtype());
         classQ.setQn(question.getMptqn() + "." + question.getQn());
+        classQ.setQorder(question.getQorder());
         classQ.setFullscore(question.getQscore());
         classQ.setStunum(stunum);
         classQ.setClassmaxscore(maxScore);

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

@@ -0,0 +1,117 @@
+package com.xhkjedu.smarking.service.report.report;
+
+import com.xhkjedu.smarking.mapper.exam.MsClassMapper;
+import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassQuestionMapper;
+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.MsrClassSubjectGrade;
+import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
+import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description：试题表
+ * @Author: WN
+ * @Date: 2024/12/24 9:47:39
+ **/
+@Service
+public class MsrClassQuestionService {
+    @Resource
+    private MsrClassSubjectGradeMapper msrClassSubjectGradeMapper;
+    @Resource
+    private MsrSubjectMapper msrSubjectMapper;
+    @Resource
+    private MsrReportparamMapper msrReportparamMapper;
+    @Resource
+    private MsrClassQuestionMapper msrClassQuestionMapper;
+    @Resource
+    private MsClassMapper msClassMapper;
+
+
+    //综合报告-试题汇总表-全部班级-科目情况
+    public Map<String,Object> getSubjectForAllSmall(MsrClassSubjectGrade subjectGrade){
+        //获取科目基础信息
+        Map<String,Object> subjectMap = msrSubjectMapper.getSubjectBaseInfo(subjectGrade.getExamid(),subjectGrade.getSubjectid());
+        subjectGrade.setClassid(0);
+        subjectGrade.setReportcode("zh");
+        //获取科目四率
+        List<MsrClassSubjectGrade> subjectGradeList = msrClassSubjectGradeMapper.listSubjectGrade(subjectGrade);
+        subjectMap.put("subjectGradeList",subjectGradeList);
+
+        //获取四率参数
+        MsrReportparam reportparam = msrReportparamMapper.getReportparamByRpbelongSubject(subjectGrade.getExamid(),"scorerate","zh",subjectGrade.getSubjectid());
+
+        Map<String,Object> rtnMap = new HashMap<>();
+        rtnMap.put("reportparam",reportparam);
+        rtnMap.put("subject",subjectMap);
+
+        return rtnMap;
+    }
+    //综合报告-试题汇总表-全部分类-按小题分析
+    public Map<String,Object> listQuestionForAllSmall(ExamReportParams params){
+        List<Map<String,Object>> questionList = msrClassQuestionMapper.listQuestionSummaryForSmall(params);
+        List<Map<String,Object>> objlist;
+        List<Map<String,Object>> sublist;
+        if(params.getSelclass() == 2){//选择班级类型1全体 2全部班级对比 3指定班级对比 4单个班级
+            //获取考试关联班级
+            List<MsClass> classList= msClassMapper.listClassByExamidAndSubjectid(params.getExamid(),params.getSubjectid());
+
+            objlist = new ArrayList<>();
+            sublist = new ArrayList<>();
+
+            //初始化学校全体
+            List<Map<String,Object>> allSchool = questionList.stream().filter(m -> m.get("classid").equals(0)).collect(Collectors.toList());
+            for(Map<String,Object> school : allSchool){
+                school.put("classname","学校全体");
+                if(school.get("qtype").equals("1")){
+                    objlist.add(school);
+                }else{
+                    sublist.add(school);
+                }
+            }
+
+            for(MsClass c : classList){
+                List<Map<String,Object>> classQues = questionList.stream().filter(m -> m.get("classid").equals(c.getClassid())).collect(Collectors.toList());
+                for(Map<String,Object> cq : classQues){
+                    cq.put("classname",c.getClassname());
+                    if(cq.get("qtype").equals("1")){
+                        objlist.add(cq);
+                    }else{
+                        sublist.add(cq);
+                    }
+                }
+            }
+        }else{
+            objlist = questionList.stream().filter(m -> m.get("qtype").equals("1")).collect(Collectors.toList());
+            sublist = questionList.stream().filter(m -> m.get("qtype").equals("2")).collect(Collectors.toList());
+        }
+
+        Map<String,Object> rtnMap = new HashMap<>();
+        rtnMap.put("objlist",objlist);
+        rtnMap.put("sublist",sublist);
+        return rtnMap;
+    }
+    //综合报告-试题汇总表-全部分类-按大题分析
+    public List<Map<String,Object>> listQuestionForAllQtype(ExamReportParams params){
+        return msrClassQuestionMapper.listQuestionSummaryForQtype(params);
+    }
+
+    //综合报告-试题汇总表-全部分类-按主(客)题分析
+    public List<Map<String,Object>> listQuestionForAllObjsub(ExamReportParams params){
+        return msrClassQuestionMapper.listQuestionSummaryForObjsub(params);
+    }
+
+    public void listQuestionForXh(ExamReportParams params){
+
+    }
+
+}

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

@@ -0,0 +1,24 @@
+package com.xhkjedu.smarking.service.report.report;
+
+import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentMapper;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description：学生报告信息
+ * @Author: WN
+ * @Date: 2024/12/24 9:50:38
+ **/
+@Service
+public class MsrStudentService {
+    @Resource
+    private MsrStudentMapper msrStudentMapper;
+
+    //综合报告-小分表-列表
+    public List<Map<String,Object>> listStuScoreAndRank(Integer examid, String subjectid){
+        return msrStudentMapper.listStuScoreAndRankByExamidAndSubjectid(examid,subjectid);
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.xhkjedu.smarking.vo.report.reportother;
+
+import lombok.Data;
+
+/**
+ * @Description：考试报告参数接受类
+ * @Author: WN
+ * @Date: 2024/12/24 15:36:48
+ **/
+@Data
+public class ExamReportParams {
+
+    private Integer examid;//考试ID
+
+    private String subjectid;//科目ID
+
+    private Integer selclass;//选择班级类型1全体 2全部班级对比 3指定班级对比 4单个班级
+
+    private Integer classid;//班级ID
+
+    private String classids;//多个班级id
+}

smarking/src/main/resources/mapper/exam/MsClassMapper.xml

@@ -114,4 +114,9 @@
         from ms_class where examid=#{examid}
         order by mcid
     </select>
+
+    <!--获取考试科目关联班级-->
+    <select id="listClassByExamidAndSubjectid" resultType="com.xhkjedu.smarking.model.exam.MsClass">
+        select classid,classname,classtype from ms_class where examid=#{examid} and subjectid=#{subjectid} order by mcid
+    </select>
 </mapper>

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

@@ -32,5 +32,74 @@
             update msr_class_question set qfdms = #{item.ndms},qfdfw = #{item.ndfw} where cqid = #{item.cqid}
         </foreach>
     </update>
+    
+    <resultMap id="zhQuestionSummary" type="java.util.Map">
+        <result property="cqid" column="cqid"/>
+        <result property="classid" column="classid"/>
+        <result property="mptqid" column="mptqid"/>
+        <result property="qn" column="qn"/>
+        <result property="qtype" column="qtype"/>
+        <result property="fullscore" column="fullscore"/>
+        <result property="schoolavgscore" column="schoolavgscore"/>
+        <result property="nd" column="nd"/>
+        <result property="ndms" column="ndms"/>
+        <result property="qfd" column="qfd"/>
+        <result property="qfdms" column="qfdms"/>
+        <result property="zqda" column="zqda"/>
+        <result property="zqrate" column="zqrate"/>
+        <result property="lfnum" column="lfnum"/>
+        <result property="lfrate" column="lfrate"/>
+        <result property="mfnum" column="mfnum"/>
+        <result property="mfrate" column="mfrate"/>
+        <collection property="objs" ofType="java.util.Map" javaType="java.util.ArrayList">
+            <result property="cqoid" column="cqoid"/>
+            <result property="xxda" column="xxda"/>
+            <result property="xxnum" column="xxnum"/>
+            <result property="xxnum" column="xxnum"/>
+            <result property="xxrate" column="xxrate"/>
+        </collection>
+    </resultMap>
+    <!--综合报告-试题汇总表-全部分类-按小题分析-->
+    <select id="listQuestionSummaryForSmall" resultMap="zhQuestionSummary">
+        select q.cqid,q.classid,q.mptqid,q.qn,q.qtype,q.fullscore,q.schoolavgscore,q.bzc,q.nd,q.ndms,q.qfd,q.qfdms,q.zqda,q.zqrate,q.lfnum,q.lfrate,q.mfnum,q.mfrate,qo.cqoid,qo.xxda,xxnum,qo.xxrate
+        from msr_class_question q
+        left join msr_class_question_obj qo on q.mptqid=qo.mptqid
+        where q.examid=#{param.examid} and q.subjectid=#{param.subjectid}
+        <if test="param.selclass == 1">and q.classid=0</if>
+        <if test="param.selclass == 4">and q.classid=#{param.classid}</if>
+        order by q.qorder
+    </select>
+    <!--综合报告-试题汇总表-全部分类-按大题分析-->
+    <select id="listQuestionSummaryForQtype" resultType="java.util.Map">
+        select t.cqtid,t.classid,t.mptid,t.mptqn,t.avgscore,t.bzc,t.nd,t.ndms,t.qfd,t.qfdms,t.fullscore,
+            t.mfnum,t.mfrate,t.lfnum,t.lfrate,c.classname from msr_class_qtype t
+            left join ms_class c on t.examid=c.examid and t.subjectid=c.subjectid and t.classid=c.classid
+        where t.examid=#{param.examid} and t.subjectid=#{param.subjectid}
+        <if test="param.selclass == 1">and t.classid=0</if>
+        <if test="param.selclass == 4">and t.classid=#{param.classid}</if>
+        order by t.cqtid,t.mptorder
+    </select>
+    <!--综合报告-试题汇总表-全部分类-按主(客)题分析-->
+    <select id="listQuestionSummaryForObjsub" resultType="java.util.Map">
+        select q.coid,q.classid,q.qtype,q.stunum,q.fullscore,q.avgscore,q.avgrate,nd,q.mfnum,q.mfrate,
+        q.lfnum,q.lfrate,c.classname from msr_class_qobjsub 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}
+        <if test="param.selclass == 1">and q.classid=0</if>
+        <if test="param.selclass == 4">and q.classid=#{param.classid}</if>
+        order by q.coid
+    </select>
+
+    <!--学科报告-各班学科试题分析-->
+    <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
+        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>
+        order by q.mptqid
+    </select>
+
 
 </mapper>

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

@@ -1,4 +1,12 @@
 <?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.reportclass.MsrClassSubjectGradeMapper">
+
+    <!--综合报告-试题汇总表-全部班级-科目情况-四率等级分析-->
+    <select id="listSubjectGrade" resultType="com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade">
+        select * from msr_class_subject_grade where examid = #{sg.examid} and subjectid = #{sg.subjectId}
+        and reportcode = #{sg.reportCode} and classid = #{sg.classId}
+    </select>
+
 </mapper>
+

smarking/src/main/resources/mapper/report/reportother/MsrReportparamMapper.xml

@@ -14,6 +14,12 @@
         order by rpid
     </select>
 
+    <!--获取科目对应参数-->
+    <select id="getReportparamByRpbelongSubject" resultType="com.xhkjedu.smarking.model.report.reportother.MsrReportparam">
+        select * from msr_reportparam where examid=#{examid} and rpbelong = #{rpbelong} and
+                                            reportcode = #{reportcode} and subjectid = #{subjectid} limit 1
+    </select>
+
     <!--删除-->
     <delete id="deleteBatchReportparam">
         delete from msp_reportparam where rpid in

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

@@ -12,4 +12,45 @@
             update msr_student set objscore = #{item.objscore},subscore = #{item.subscore} where rsid = #{item.rsid}
         </foreach>
     </update>
+
+    <!--综合报告-小分表-学生分数排名-->
+    <resultMap id="studentChengji" type="java.util.Map">
+        <id property="rsid" column="rsid"/>
+        <result property="examid" column="examid"/>
+        <result property="subjectid" column="subjectid"/>
+        <result property="studentid" column="studentid"/>
+        <result property="username" column="username"/>
+        <result property="examno" column="examno"/>
+        <result property="classid" column="classid"/>
+        <result property="classname" column="classname"/>
+        <result property="stuscore" column="stuscore"/>
+        <result property="classrank" column="classrank"/>
+        <result property="schoolrank" column="schoolrank"/>
+        <result property="objscore" column="objscore"/>
+        <result property="subscore" column="subscore"/>
+        <result property="totalscore" column="totalscore"/>
+        <collection property="questions" ofType="java.util.Map" javaType="java.util.ArrayList">
+            <result property="mpsqid" column="mpsqid"/>
+            <result property="qn" column="qn"/>
+            <result property="stuscore" column="xtscore"/>
+            <result property="answertype" column="answertype"/>
+            <result property="stuanswer" column="stuanswer"/>
+            <result property="qanswer" column="qanswer"/>
+            <result property="qscore" column="qscore"/>
+            <result property="qtype" column="qtype"/>
+            <result property="mptqn" column="mptqn"/>
+        </collection>
+    </resultMap>
+    <select id="listStuScoreAndRankByExamidAndSubjectid" resultMap="studentChengji">
+        select distinct s.rsid,s.examid,s.subjectid,s.studentid,s.classid,c.classname,s.stuscore,s.classrank,
+        s.schoolrank,s.objscore,s.subscore,sq.mpsqid,sq.qn,sq.stuscore as xtscore,sq.answertype,sq.stuanswer,
+        q.qanswer,q.qscore,q.qtype,qt.mptqn
+        from msr_student s left join ms_class c on s.classid=c.classid
+        left join ms_paper_student_question sq on s.examid=sq.examid
+        and s.subjectid=sq.subjectid and s.studentid=sq.studentid
+        left join ms_paper_qtype_question q on sq.mptqid=q.mptqid
+        left join ms_paper_qtype qt on q.mptid=qt.mptid
+        where s.examid=#{examid} and s.subjectid=#{subjectid}
+        order by s.schoolrank,s.rsid,qt.mptorder,q.qorder
+    </select>
 </mapper>

smarking/src/main/resources/mapper/report/reportsubject/MsrSubjectMapper.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.reportsubject.MsrSubjectMapper">
+
+    <!--综合报告-试题汇总表-全部班级-科目情况-->
+    <select id="getSubjectBaseInfo" resultType="java.util.Map">
+        select sid,examid,subjectid,avgscore,nd,qfd,maxscore,minscore,stunum from msr_subject
+        where examid=#{examid} and subjectid=#{subjectid}
+    </select>
+
 </mapper>

smarking/src/test/java/com/xhkjedu/smarking/SmarkingApplicationTests.java

@@ -1,13 +1,24 @@
 package com.xhkjedu.smarking;
 
+import com.xhkjedu.smarking.service.report.generate.ReportGenerateQuestionService;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import javax.annotation.Resource;
+
 @SpringBootTest
 class SmarkingApplicationTests {
 
+    @Resource
+    private ReportGenerateQuestionService reportGenerateQuestionService;
+
     @Test
     void contextLoads() {
+        try {
+            reportGenerateQuestionService.generateQuestion(1,3);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
     }
 
 }