综合报告：分数段、名次比例分析

仲裁完善

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

@@ -131,6 +131,41 @@ public class ZhReportController {
         return new ResultVo(0, "获取成功", msrClassService.listClassForBjDb(params));
     }
 
+    /**
+     * @Description 分数段统计-指标
+     * @Date 2025/1/8 16:24
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/fsd_zb")
+    public ResultVo getFsdZb(@RequestBody StudentParams params) {
+        N_Utils.validation(new Object[]{
+                params.getExamid(), "考试id", 1
+                , params.getSubjectid(), "科目", 2
+        });
+        return new ResultVo(0, "获取成功", msrClassService.getFsdZb(params));
+    }
+
+    /**
+     * @Description 分数段统计-列表
+     * @Date 2025/1/8 16:47
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/fsd")
+    public ResultVo listClassForFsd(@RequestBody StudentParams params) {
+        N_Utils.validation(new Object[]{
+                params.getExamid(), "考试id", 1
+                , params.getSubjectid(), "科目", 2
+                , params.getClassids(), "班级", 3
+                , params.getType(), "分段类型", 1
+        });
+        params.setReportcode("zh");
+        return new ResultVo(0, "获取成功", msrClassService.listClassForFsd(params));
+    }
+
     /*
      * @Description 试题汇总-全部班-科目情况
      * @Date 2024/12/24 14:47:43
@@ -184,6 +219,25 @@ public class ZhReportController {
         return new ResultVo(0,"获取成功",msrClassQuestionService.listQuestionForAllObjsub(params));
     }
 
+    /**
+     * @Description 名次和比例分析-列表
+     * @Date 2025/1/9 16:50
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/mcbl")
+    public ResultVo listClassForMcBl(@RequestBody StudentParams params) {
+        N_Utils.validation(new Object[]{
+                params.getExamid(), "考试id", 1
+                , params.getSubjectid(), "科目", 2
+                , params.getClassids(), "班级", 3
+                , params.getType(), "分段类型", 1
+        });
+        params.setReportcode("zh");
+        return new ResultVo(0, "获取成功", msrClassService.listClassForMcBl(params));
+    }
+
     /**
      * @Description 违纪优秀-班级统计
      * @Date 2025/1/3 14:47

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

@@ -2,6 +2,11 @@ package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassRankrate;
+import com.xhkjedu.smarking.vo.report.reportstu.StudentParams;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-班级学科名次和比例表 Mapper 接口
@@ -9,4 +14,6 @@ import com.xhkjedu.smarking.model.report.reportclass.MsrClassRankrate;
  * @Date 2024-12-09
  */
 public interface MsrClassRankrateMapper extends TkMapper<MsrClassRankrate> {
+    //综合报告-名次和比例分析-列表
+    List<Map> listClassForMcBl(@Param("sql") String sql, @Param("params") StudentParams params);
 }

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

@@ -2,6 +2,11 @@ package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassSection;
+import com.xhkjedu.smarking.vo.report.reportstu.StudentParams;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 阅卷报告-班级学科分段统计表 Mapper 接口
@@ -9,4 +14,6 @@ import com.xhkjedu.smarking.model.report.reportclass.MsrClassSection;
  * @Date 2024-12-09
  */
 public interface MsrClassSectionMapper extends TkMapper<MsrClassSection> {
+    //综合报告-分数段统计列表
+    List<Map> listClassForFsd(@Param("sql") String sql, @Param("params") StudentParams params);
 }

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

@@ -1,7 +1,7 @@
 package com.xhkjedu.smarking.service.report.report;
 
 import com.alibaba.fastjson.JSON;
-import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectMapper;
+import com.xhkjedu.smarking.mapper.report.reportclass.*;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.service.report.reportother.MsrReportparamService;
 import com.xhkjedu.smarking.utils.MarkingUtil;
@@ -25,6 +25,10 @@ public class MsrClassService {
     @Resource
     private MsrClassSubjectMapper msrClassSubjectMapper;
     @Resource
+    private MsrClassSectionMapper msrClassSectionMapper;
+    @Resource
+    private MsrClassRankrateMapper msrClassRankrateMapper;
+    @Resource
     private MsrReportparamService msrReportparamService;
 
     /**
@@ -72,6 +76,12 @@ public class MsrClassService {
             sql.append(" and csg.rangename in ('").append(String.join("','", rangeNames)).append("') ");
         }
         List<Map> list = msrClassSubjectMapper.listClassForBjDb(sql.toString(), params);
+        return formatList(params, list, infoFields, gradeFields);
+    }
+
+    //格式化列表
+    private List<Map<String, Object>> formatList(StudentParams params, List<Map> list
+            , List<String> infoFields, String[] gradeFields) {
         Map<Integer, List<Map>> collect = list.stream().collect(Collectors.groupingBy(
                 m -> N_Utils.obj2Int(m.get("classid")), LinkedHashMap::new, Collectors.toList()));
         List<Map<String, Object>> result = new ArrayList<>();
@@ -141,4 +151,73 @@ public class MsrClassService {
         map.put("allrate", JSON.parseObject(reportparam.getSzjson(), SzJsonVo.class));
         return map;
     }
+
+    /**
+     * @Description 分数段统计-指标
+     * @Date 2025/1/8 16:24
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public Object getFsdZb(StudentParams params) {
+        MsrReportparam reportParams = msrReportparamService.getOneReportParams(params.getExamid(), "scoresection", "zh", params.getSubjectid());
+        Integer rptype = reportParams.getRptype();
+        String szjson = reportParams.getSzjson();
+        Map<String, Object> map = new HashMap<>();
+        map.put("rptype", rptype);
+        if (rptype.equals(0)) {
+            map.put("params", JSON.parseObject(szjson, Map.class));
+        } else {
+            map.put("params", JSON.parseArray(szjson, Map.class));
+        }
+        return map;
+    }
+
+    /**
+     * @Description 综合报告-分数段统计-列表
+     * @Date 2025/1/8 16:47
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public Object listClassForFsd(StudentParams params) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("cs.classid,cs.stunum");
+        sql.append(",if(cs.classid=0,'学校全体',(select c.classname from t_class c where c.classid=cs.classid)) as classname");
+        List<String> infoFields = new ArrayList<>();
+        infoFields.add("classid");
+        infoFields.add("classname");
+        infoFields.add("stunum");
+
+        String gradeField = "fzfw,fzfwnum,fzfwrate";
+        sql.append(",").append(gradeField);
+        String[] gradeFields = gradeField.split(",");
+        sql.append(" from msr_class_section cs ");
+        List<Map> list = msrClassSectionMapper.listClassForFsd(sql.toString(), params);
+        return formatList(params, list, infoFields, gradeFields);
+    }
+
+    /**
+     * @Description 综合报告-名次和比例分析-列表
+     * @Date 2025/1/9 16:51
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public Object listClassForMcBl(StudentParams params) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("cr.classid,cr.stunum");
+        sql.append(",if(cr.classid=0,'学校全体',(select c.classname from t_class c where c.classid=cr.classid)) as classname");
+        List<String> infoFields = new ArrayList<>();
+        infoFields.add("classid");
+        infoFields.add("classname");
+        infoFields.add("stunum");
+
+        String gradeField = "ztname,ctname,rnum,rrate";
+        sql.append(",").append(gradeField);
+        String[] gradeFields = gradeField.split(",");
+        sql.append(" msr_class_rankrate cr ");
+        List<Map> list = msrClassRankrateMapper.listClassForMcBl(sql.toString(), params);
+        return formatList(params, list, infoFields, gradeFields);
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportstu/StudentParams.java

@@ -23,4 +23,6 @@ public class StudentParams extends BaseBean {
     private String fieldname;//排序字段
     private String fieldvalue;//排序列值
     private Integer od;//标识排序类型1升序2降序
+    private Integer type;//分段类型（1分段统计 2累计统计）
+    private String reportcode;//归属报告模块编码
 }

smarking/src/main/resources/mapper/papercheck/MsPaperCheckTeacherArbitrateMapper.xml

@@ -141,6 +141,7 @@
         <result property="blockorder" column="blockorder"/>
         <result property="bqnum" column="bqnum"/>
         <result property="hidefirstscore" column="hidefirstscore"/>
+        <result property="correcttype" column="correcttype"/>
         <collection property="questions" select="listQuestion" column="mblockid"/>
     </resultMap>
     <select id="listQuestion" resultType="java.util.Map">
@@ -151,7 +152,7 @@
     </select>
     <select id="listBlockArbitrate" resultMap="arbitrateBlockResultMap">
         select pb.blockname,pb.blockorder,pb.bqnum
-        ,pc.mblockid,pc.hidefirstscore
+        ,pc.mblockid,pc.hidefirstscore,pc.correcttype
         from ms_paper_check pc left join ms_paper_student_block psb on psb.mblockid = pc.mblockid and psb.mpid = pc.mpid
         inner join ms_paper_block pb on pc.mblockid = pb.mblockid and pb.mpid = pc.mpid
         where pc.mpid=#{param.mpid} and (psb.arbitratestate=1 or psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid})
@@ -164,7 +165,7 @@
     <!--待仲裁试题列表-->
     <select id="listQuestionArbitrate" resultType="java.util.Map">
         select psb.qorder,psb.qn,psb.qscore
-        ,pc.mblockid,pc.hidefirstscore
+        ,pc.mblockid,pc.hidefirstscore,pc.correcttype
         from ms_paper_check pc left join ms_paper_student_question psb on psb.mptqid = pc.mblockid and psb.mpid = pc.mpid
         where pc.mpid=#{param.mpid} and (psb.arbitratestate=1 or psb.arbitratestate=2 and psb.arbitrateid=#{param.handleid})
         <if test="param.usertype!=null and param.usertype==1">

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

@@ -1,4 +1,13 @@
 <?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.MsrClassRankrateMapper">
+    <!--综合报告-名次和比例分析-列表-->
+    <select id="listClassForMcBl" resultType="java.util.Map">
+        select ${sql}
+        where examid=#{params.examid} and subjectid=#{params.subjectid}
+        and rtype=#{params.type}
+        <foreach collection="params.classids" item="classid" open="and classid in (" close=")" separator=",">
+            #{classid}
+        </foreach>
+    </select>
 </mapper>

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

@@ -1,4 +1,13 @@
 <?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.MsrClassSectionMapper">
+    <!--综合报告-分数段统计列表-->
+    <select id="listClassForFsd" resultType="java.util.Map">
+        select ${sql}
+        where cs.examid=#{params.examid} and cs.subjectid=#{params.subjectid}
+        and cs.type=#{params.type} and cs.reportcode=#{params.reportcode}
+        <foreach collection="params.classids" item="classid" open="and classid in (" close=")" separator=",">
+            #{classid}
+        </foreach>
+    </select>
 </mapper>

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

@@ -5,5 +5,8 @@
     <select id="listClassForBjDb" resultType="java.util.Map">
         select ${sql}
         where cs.examid=#{params.examid} and cs.subjectid=#{params.subjectid}
+        <foreach collection="params.classids" item="classid" open="and cs.classid in (" close=")" separator=",">
+            #{classid}
+        </foreach>
     </select>
 </mapper>

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

@@ -79,5 +79,8 @@
         <if test="params.subjectid!='zf'">
             and s.subjectid=#{params.subjectid}
         </if>
+        <foreach collection="params.classids" item="classid" open="and classid in (" close=")" separator=",">
+            #{classid}
+        </foreach>
     </select>
 </mapper>