综合报告：总概览、违纪优秀统计

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

@@ -4,8 +4,9 @@ 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.model.report.reportstu.MsrStudentAction;
+import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
+import com.xhkjedu.smarking.service.report.report.*;
 import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
@@ -33,6 +34,24 @@ public class ZhReportController {
     private MsrStudentService msrStudentService;
     @Resource
     private MsrClassQuestionService msrClassQuestionService;
+    @Resource
+    private MsrSubjectService msrSubjectService;
+    @Resource
+    private MsrActionService msrActionService;
+
+    /**
+     * @Description 总概览
+     * @Date 2025/1/3 14:59
+     * @Author YWX
+     * @Param [subject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/zgl")
+    public ResultVo listSubjectForZgl(@RequestBody MsrSubject subject) {
+        N_Utils.validation(new Object[]{subject.getExamid(), "考试id", 1});
+        return new ResultVo(0, "获取成功", msrSubjectService.listSubjectForZgl(subject));
+    }
+
     /*
      * @Description 小分表-列表
      * @Date 2024/12/24 10:25:06
@@ -104,4 +123,38 @@ public class ZhReportController {
         return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForAllObjsub(params));
     }
 
+    /**
+     * @Description 违纪优秀-班级统计
+     * @Date 2025/1/3 14:47
+     * @Author YWX
+     * @Param [action]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/wjyx_bj")
+    public ResultVo listXwBj(@RequestBody MsrStudentAction action) {
+        N_Utils.validation(new Object[]{action.getExamid(), "考试id", 1, action.getActiontype(), "类型", 1});
+        return new ResultVo(0, "获取成功", msrActionService.listXwBj(action));
+    }
+
+    /**
+     * @Description 违纪优秀-学生统计
+     * @Date 2025/1/3 14:49
+     * @Author YWX
+     * @Param [action]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/wjyx_bj")
+    public ResultVo listXwXs(@RequestBody MsrStudentAction action) {
+        N_Utils.validation(new Object[]{action.getExamid(), "考试id", 1, action.getActiontype(), "类型", 1});
+        Integer page = action.getPage();
+        if (N_Utils.isEmptyInteger(page)) {
+            return new ResultVo(0, "获取成功", msrActionService.listXwXs(action));
+        } else {
+            PageHelper.startPage(page, action.getPageSize());
+            List<Map> list = msrActionService.listXwXs(action);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取成功", pageResult);
+        }
+    }
+
 }

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassAction;
+import com.xhkjedu.smarking.model.report.reportstu.MsrStudentAction;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -21,4 +22,7 @@ public interface MsrClassActionMapper extends TkMapper<MsrClassAction> {
 
     //违规试卷
     List<Map> listBadQuesActionByExamId(@Param("examid") Integer examid,@Param("subjectids") String subjectids);
+
+    //行为分析-班级
+    List<Map> listXwBj(@Param("action") MsrStudentAction action);
 }

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

@@ -5,6 +5,7 @@ import com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-班级学科四率等级分析表 Mapper 接口
@@ -16,6 +17,9 @@ public interface MsrClassSubjectGradeMapper extends TkMapper<MsrClassSubjectGrad
     //综合报告-试题汇总表-全部班级-科目情况-四率等级分析
     List<MsrClassSubjectGrade> listSubjectGrade(@Param("sg")MsrClassSubjectGrade sg);
 
-    //综合报告-班级堆积-全科及格率分析
+    //综合报告-班级对比-全科及格率分析
     List<MsrClassSubjectGrade> listSubjectGradeForQk(@Param("examid") Integer examid,@Param("reportcode") String reportcode);
+
+    //综合报告-整体四率分析
+    List<Map<String,Object>> getZfScoreRate(@Param("examid") Integer examid);
 }

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

@@ -2,6 +2,10 @@ package com.xhkjedu.smarking.mapper.report.reportstu;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudentAction;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 考试报告学生违纪优秀分析表 Mapper 接口
@@ -9,4 +13,6 @@ import com.xhkjedu.smarking.model.report.reportstu.MsrStudentAction;
  * @Date 2025-01-03
  */
 public interface MsrStudentActionMapper extends TkMapper<MsrStudentAction> {
+    //行为分析-学生
+    List<Map> listXwBj(@Param("action") MsrStudentAction action);
 }

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

@@ -22,4 +22,6 @@ public interface MsrStudentMapper extends TkMapper<MsrStudent> {
     List<Map<String, Object>> listStuScoreAndRankByExamidAndSubjectid(@Param("examid") int examid, @Param("subjectid") String subjectid);
     //学生报告-学生学科试题分析
     List<Map<String, Object>> listStuSubjectQuestions(@Param("params") ExamReportParams params);
+    //综合报告-总概览-整体分数分布分析
+    List<Map<String, Object>> listScoreForZgl(@Param("examid") Integer examid,@Param("subjectid") String subjectid);
 }

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

@@ -1,7 +1,12 @@
 package com.xhkjedu.smarking.mapper.report.reportsubject;
 
 import com.xhkjedu.base.TkMapper;
+import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectClass;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-科目班级分数分布区间分析表 Mapper 接口
@@ -9,4 +14,5 @@ import com.xhkjedu.smarking.model.report.reportsubject.MsrSubjectClass;
  * @Date 2024-12-09
  */
 public interface MsrSubjectClassMapper extends TkMapper<MsrSubjectClass> {
+    List<Map> listSubjectClass(@Param("subject") MsrSubject subject);
 }

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

@@ -4,6 +4,7 @@ import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,4 +16,7 @@ public interface MsrSubjectMapper extends TkMapper<MsrSubject> {
 
     //综合报告-试题汇总表-全部班级-科目情况
     Map<String, Object> getSubjectBaseInfo(@Param("examid")Integer examid, @Param("subjectid")String subjectid);
+
+    //科目分析
+    List<Map> listSubjectForZgl(@Param("examid") Integer examid);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportsubject/MsrSubject.java

@@ -39,8 +39,10 @@ public class MsrSubject extends BaseBean {
     private Double scorerate;
     //总人数
     private Integer totalnum;
-    //实考人数
+    //参考人数
     private Integer stunum;
+    //参考人数占比
+    private Double numrate;
     //缺考人数
     private Integer missnum;
     //标准差

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

@@ -128,6 +128,7 @@ public class ReportGenerateSubjectService {
         int missnum = totalnum - stunum;
         msrSubject.setTotalnum(totalnum);
         msrSubject.setStunum(stunum);
+        msrSubject.setNumrate(N_Utils.getIntegerDivideAndMulitiply(stunum, totalnum));
         msrSubject.setMissnum(missnum);
         DoubleSummaryStatistics subjectStatistics = studentList2.stream().mapToDouble(MsrStudent::getStuscore).summaryStatistics();
         double subjectStatisticsMax = N_Utils.handleInfinity(subjectStatistics.getMax());

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

@@ -0,0 +1,33 @@
+package com.xhkjedu.smarking.service.report.report;
+
+import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassActionMapper;
+import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentActionMapper;
+import com.xhkjedu.smarking.model.report.reportstu.MsrStudentAction;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ *@Description 优秀违纪报告查询服务
+ *@Author ywx
+ *Date 2025/1/3 14:33
+ **/
+@Service
+public class MsrActionService {
+    @Resource
+    private MsrClassActionMapper msrClassActionMapper;
+    @Resource
+    private MsrStudentActionMapper msrStudentActionMapper;
+
+    //行为分析-班级
+    public List<Map> listXwBj(MsrStudentAction action) {
+        return msrClassActionMapper.listXwBj(action);
+    }
+
+    //行为分析-学生
+    public List<Map> listXwXs(MsrStudentAction action) {
+        return msrStudentActionMapper.listXwBj(action);
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.xhkjedu.smarking.service.report.report;
+
+import org.springframework.stereotype.Service;
+
+/**
+ *@Description 班级报告查询服务
+ *@Author ywx
+ *Date 2025/1/3 14:31
+ **/
+@Service
+public class MsrClassService {
+}

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

@@ -0,0 +1,45 @@
+package com.xhkjedu.smarking.service.report.report;
+
+import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectGradeMapper;
+import com.xhkjedu.smarking.mapper.report.reportstu.MsrStudentMapper;
+import com.xhkjedu.smarking.mapper.report.reportsubject.MsrSubjectMapper;
+import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ *@Description 科目报告查询服务
+ *@Author ywx
+ *Date 2025/1/3 14:32
+ **/
+@Service
+public class MsrSubjectService {
+    @Resource
+    private MsrSubjectMapper msrSubjectMapper;
+    @Resource
+    private MsrStudentMapper msrStudentMapper;
+    @Resource
+    private MsrClassSubjectGradeMapper msrClassSubjectGradeMapper;
+
+    /**
+     * @Description 总概览
+     * @Date 2025/1/3 15:49
+     * @Author YWX
+     * @Param [subject]
+     * @Return java.util.Map
+     **/
+    public Map<String, Object> listSubjectForZgl(MsrSubject subject) {
+        Integer examid = subject.getExamid();
+        Map<String, Object> map = new LinkedHashMap<>();
+        //总人数、平均分、标准差、难度、差异系数分析
+        map.put("subjects", msrSubjectMapper.listSubjectForZgl(examid));
+        //整体分数分布分析
+        map.put("scores", msrStudentMapper.listScoreForZgl(examid,"zf"));
+        //整体四率分析
+        map.put("scorerates", msrClassSubjectGradeMapper.getZfScoreRate(examid));
+        return map;
+    }
+}

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

@@ -22,4 +22,17 @@
         where psq.examid=#{examid} and psq.subjectid in(#{subjectids}) and hasbad=1
         group by psq.studentid, psq.subjectid
     </select>
+    <!--行为分析-班级-->
+    <select id="listXwBj" resultType="java.util.Map">
+        select c.classname,ca.classid,ca.subjectjson
+        from msr_rclass_action ca left join t_class c on ca.classid = c.classid
+        where ca.examid=#{action.examid} and ca.actiontype=#{action.actiontype}
+        <if test="action.classid!=null and action.classid!=0">
+            and ca.classid=#{action.classid}
+        </if>
+        <foreach collection="action.classids" item="classid" open="and ca.classid in(0," separator="," close=")">
+            ${classid}
+        </foreach>
+        order by c.classtype,c.classorder,c.classid
+    </select>
 </mapper>

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

@@ -7,12 +7,18 @@
         select * from msr_class_subject_grade where examid = #{sg.examid} and subjectid = #{sg.subjectId}
         and reportcode = #{sg.reportCode} and classid = #{sg.classId}
     </select>
-    <!--综合报告-班级堆积-全科及格率分析-->
+    <!--综合报告-班级对比-全科及格率分析-->
     <select id="listSubjectGradeForQk" resultType="com.xhkjedu.smarking.model.report.reportclass.MsrClassSubjectGrade">
         select subjectid,rangename,stuids
         from msr_class_subject_grade
         where examid = #{examid} and classid = 0 and reportcode = #{reportcode}
     </select>
+    <!--综合报告-整体四率分析-->
+    <select id="getZfScoreRate" resultType="java.util.Map">
+        select rangename,rangenum,rangerate
+        from msr_class_subject_grade
+        where examid = #{examid} and reportcode = #{reportcode} and classid = 0 and subjectid = 'zf'
+    </select>
 
 </mapper>
 

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

@@ -1,4 +1,21 @@
 <?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.MsrStudentActionMapper">
+    <!--行为分析-学生-->
+    <select id="listXwBj" resultType="java.util.Map">
+        select c.classname,sa.classid,sa.studentid,sa.subjectjson,u.username,u.loginname
+        from msr_student_action sa left join t_class c on sa.classid = c.classid
+        left join t_user u on sa.studentid=u.userid
+        where sa.examid=#{action.examid} and sa.actiontype=#{action.actiontype}
+        <if test="action.classid!=null and action.classid!=0">
+            and sa.classid=#{action.classid}
+        </if>
+        <foreach collection="action.classids" item="classid" open="and sa.classid in(0," separator="," close=")">
+            ${classid}
+        </foreach>
+        <if test="action.createname!=null and action.createname!=''">
+            and (u.username like '%${action.createname}%' or u.loginname like '%${action.createname}%')
+        </if>
+        order by c.classtype,c.classorder,c.classid
+    </select>
 </mapper>

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

@@ -65,4 +65,11 @@
         where q.examid=#{params.examid} and q.subjectid=#{params.subjectid} and q.studentid=#{params.studentid}
         order by q.mptqid
     </select>
+    <!--综合报告-总概览-整体分数分布分析-->
+    <select id="listScoreForZgl" resultType="java.util.Map">
+        select stuscore,count(*) as num
+        from msr_student
+        where examid=#{examid} and subjectid=#{subjectid}
+        group by stuscore
+    </select>
 </mapper>

smarking/src/main/resources/mapper/report/reportsubject/MsrSubjectClassMapper.xml

@@ -1,4 +1,9 @@
 <?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.MsrSubjectClassMapper">
+    <select id="listSubjectClass" resultType="java.util.Map">
+        select *
+        from msr_subject_class
+        where examid = #{subject.examid}
+    </select>
 </mapper>

smarking/src/main/resources/mapper/report/reportsubject/MsrSubjectMapper.xml

@@ -7,5 +7,14 @@
         select sid,examid,subjectid,avgscore,nd,qfd,maxscore,minscore,stunum from msr_subject
         where examid=#{examid} and subjectid=#{subjectid}
     </select>
+    <!--综合报告-总概览-->
+    <select id="listSubjectForZgl" resultType="java.util.Map">
+        select sid,subjectid,subjectname
+        ,totalnum,stunum,numrate
+        ,fullscore,avgscore,scorerate
+        ,bzc,nd,cyxs
+        from msr_subject
+        where examid=#{examid}
+    </select>
 
 </mapper>