Merge remote-tracking branch 'origin/ywx' into wn

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

@@ -0,0 +1,66 @@
+package com.xhkjedu.smarking.controller.report;
+
+import com.xhkjedu.smarking.model.report.reportsubject.MsrSubject;
+import com.xhkjedu.smarking.service.report.report.MsrStudentService;
+import com.xhkjedu.smarking.service.report.report.MsrSubjectService;
+import com.xhkjedu.smarking.vo.report.reportstu.StudentParams;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ *@Description 校级报告
+ *@Author ywx
+ *Date 2025/1/10 14:31
+ **/
+@RestController
+@RequestMapping("/rxj")
+public class XjReportController {
+    @Resource
+    private MsrSubjectService msrSubjectService;
+    @Resource
+    private MsrStudentService msrStudentService;
+
+    /**
+     * @Description 总体情况汇总分析-总分基本情况成绩分析
+     * @Date 2025/1/10 14:54
+     * @Author YWX
+     * @Param [subject]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/hz_zf")
+    public ResultVo getExamForHzZf(@RequestBody MsrSubject subject) {
+        Integer examid = subject.getExamid();
+        N_Utils.validation(new Object[]{examid, "考试id", 1});
+        return new ResultVo(0, "获取成功", msrSubjectService.getExamForHzZf(examid));
+    }
+
+    /**
+     * @Description 总体情况汇总分析-各学科基本数据对比情况
+     * @Date 2025/1/10 15:04
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/hz_xk")
+    public ResultVo listSubjectForHzXk(@RequestBody StudentParams params) {
+        N_Utils.validation(new Object[]{params.getExamid(), "考试id", 1});
+        return new ResultVo(0, "获取成功", msrSubjectService.listSubjectForHzXk(params));
+    }
+
+    /**
+     * @Description 总分分布
+     * @Date 2025/1/10 17:28
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/zffb")
+    public ResultVo listScoreForZfFb(@RequestBody StudentParams params) {
+        N_Utils.validation(new Object[]{params.getExamid(), "考试id", 1});
+        return new ResultVo(0, "获取成功", msrStudentService.listScoreForZfFb(params));
+    }
+
+}

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

@@ -55,6 +55,13 @@ public class ZhReportController {
         return new ResultVo(0, "获取成功", msrSubjectService.listSubjectForZgl(subject));
     }
 
+    /**
+     * @Description 排行榜-指标
+     * @Date 2025/1/10 14:49
+     * @Author YWX
+     * @Param []
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
     @PostMapping("/phb_zb")
     public ResultVo listPhbZb() {
         return new ResultVo(0, "获取成功", msrStudentService.listPhbZb());
@@ -121,12 +128,14 @@ public class ZhReportController {
      **/
     @PostMapping("/bjdb")
     public ResultVo listClassForBjDb(@RequestBody StudentParams params) {
+        List<Integer> classids = params.getClassids();
         N_Utils.validation(new Object[]{
                 params.getExamid(), "考试id", 1
                 , params.getSubjectid(), "科目", 2
-                , params.getClassids(), "班级", 3
+                , classids, "班级", 3
                 , params.getLabels(), "指标", 3
         });
+        classids.add(0);
         return new ResultVo(0, "获取成功", msrClassService.listClassForBjDb(params));
     }
 
@@ -155,12 +164,14 @@ public class ZhReportController {
      **/
     @PostMapping("/fsd")
     public ResultVo listClassForFsd(@RequestBody StudentParams params) {
+        List<Integer> classids = params.getClassids();
         N_Utils.validation(new Object[]{
                 params.getExamid(), "考试id", 1
                 , params.getSubjectid(), "科目", 2
-                , params.getClassids(), "班级", 3
+                , classids, "班级", 3
                 , params.getType(), "分段类型", 1
         });
+        classids.add(0);
         params.setReportcode("zh");
         return new ResultVo(0, "获取成功", msrClassService.listClassForFsd(params));
     }
@@ -227,16 +238,55 @@ public class ZhReportController {
      **/
     @PostMapping("/mcbl")
     public ResultVo listClassForMcBl(@RequestBody StudentParams params) {
+        List<Integer> classids = params.getClassids();
         N_Utils.validation(new Object[]{
                 params.getExamid(), "考试id", 1
                 , params.getSubjectid(), "科目", 2
-                , params.getClassids(), "班级", 3
-                , params.getType(), "分段类型", 1
+                , classids, "班级", 3
+                , params.getType(), "类型", 1
         });
-        params.setReportcode("zh");
+        classids.add(0);
         return new ResultVo(0, "获取成功", msrClassService.listClassForMcBl(params));
     }
 
+    /**
+     * @Description 总分分档上线-列表
+     * @Date 2025/1/10 9:26
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/fdsx_zf")
+    public ResultVo listClassForFdSxZf(@RequestBody StudentParams params) {
+        List<Integer> classids = params.getClassids();
+        N_Utils.validation(new Object[]{
+                params.getExamid(), "考试id", 1
+                , classids, "班级", 3
+        });
+        classids.add(0);
+        params.setSubjectid("zf");
+        return new ResultVo(0, "获取成功", msrClassService.listClassForFdSxZf(params));
+    }
+
+    /**
+     * @Description 学科分档上线-列表
+     * @Date 2025/1/10 11:35
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/fdsx_xk")
+    public ResultVo listClassForFdSxXk(@RequestBody StudentParams params) {
+        List<Integer> classids = params.getClassids();
+        N_Utils.validation(new Object[]{
+                params.getExamid(), "考试id", 1
+                , classids, "班级", 3
+                ,params.getDworder(), "档位序号", 1
+        });
+        classids.add(0);
+        return new ResultVo(0, "获取成功", msrClassService.listClassForFdSxXk(params));
+    }
+
     /**
      * @Description 违纪优秀-班级统计
      * @Date 2025/1/3 14:47

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

@@ -2,6 +2,11 @@ package com.xhkjedu.smarking.mapper.report.reportclass;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportclass.MsrClassNearline;
+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.MsrClassNearline;
  * @Date 2024-12-09
  */
 public interface MsrClassNearlineMapper extends TkMapper<MsrClassNearline> {
+    //分档上线-列表
+    List<Map> listClassForFdSx(@Param("sql") String sql, @Param("params") StudentParams params);
 }

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

@@ -4,6 +4,8 @@ import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportother.MsrExam;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 /**
  * @Description 阅卷报告-总体分析表 Mapper 接口
  * @Author auto
@@ -13,4 +15,10 @@ public interface MsrExamMapper extends TkMapper<MsrExam> {
 
     //清除单次考试所有报告
     void deleteReportByExamid(@Param("examid") int examid);
+
+    //获取单次考试的总分和最高分
+    Map<String, Object> getFullAndMaxScoreByExamId(@Param("examid") Integer examid);
+
+    //总分基本情况成绩分析
+    Map getExamForHzZf(@Param("examid") Integer examid);
 }

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

@@ -27,4 +27,7 @@ public interface MsrStudentMapper extends TkMapper<MsrStudent> {
 
     //综合报告-排行榜
     List<Map> listStudentForPhb(@Param("sql") String sql, @Param("params") StudentParams params);
+
+    //学生成绩分析
+    List<MsrStudent> listStudentBySql(@Param("sql") String sql);
 }

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

@@ -19,4 +19,7 @@ public interface MsrSubjectMapper extends TkMapper<MsrSubject> {
 
     //科目分析
     List<Map> listSubjectForZgl(@Param("examid") Integer examid);
+
+    //科目分析列表
+    List<Map> listSubjectBySql(@Param("sql") String sql);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportother/MsrExam.java

@@ -31,10 +31,14 @@ public class MsrExam extends BaseBean {
     private Integer missnum;
     //考试科目数量
     private Integer subjectnum;
+    //满分
+    private Double fullscore;
     //最高分
     private Double maxscore;
     //最低分
     private Double minscore;
+    //平均分
+    private Double avgscore;
     //标准差
     private Double bzc;
     //保存时间

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

@@ -2,6 +2,7 @@ package com.xhkjedu.smarking.service.report.report;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.smarking.mapper.report.reportclass.*;
+import com.xhkjedu.smarking.mapper.report.reportother.MsrExamMapper;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.service.report.reportother.MsrReportparamService;
 import com.xhkjedu.smarking.utils.MarkingUtil;
@@ -29,6 +30,10 @@ public class MsrClassService {
     @Resource
     private MsrClassRankrateMapper msrClassRankrateMapper;
     @Resource
+    private MsrClassNearlineMapper msrClassNearlineMapper;
+    @Resource
+    private MsrExamMapper msrExamMapper;
+    @Resource
     private MsrReportparamService msrReportparamService;
 
     /**
@@ -42,7 +47,7 @@ public class MsrClassService {
         List<LabelVo> labels = params.getLabels();
         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");
+        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");
@@ -113,7 +118,7 @@ public class MsrClassService {
 
         String fieldname = params.getFieldname();
         if (N_Utils.isNotEmpty(fieldname)) {
-            result = MarkingUtil.sortBySubjectField(result, params.getSubjectid(), fieldname, params.getOd(), "gradeList");
+            result = MarkingUtil.sortBySubjectField(result, params.getFieldvalue(), fieldname, params.getOd(), "gradeList");
         }
         return result;
     }
@@ -183,7 +188,7 @@ public class MsrClassService {
     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");
+        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");
@@ -207,7 +212,7 @@ public class MsrClassService {
     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");
+        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");
@@ -216,8 +221,62 @@ public class MsrClassService {
         String gradeField = "ztname,ctname,rnum,rrate";
         sql.append(",").append(gradeField);
         String[] gradeFields = gradeField.split(",");
-        sql.append(" msr_class_rankrate cr ");
+        sql.append(" from msr_class_rankrate cr ");
         List<Map> list = msrClassRankrateMapper.listClassForMcBl(sql.toString(), params);
         return formatList(params, list, infoFields, gradeFields);
     }
+
+    /**
+     * @Description 总分分档上线-列表
+     * @Date 2025/1/10 9:26
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public Object listClassForFdSxZf(StudentParams params) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("cn.classid");
+        sql.append(",if(cn.classid=0,'全体',(select c.classname from t_class c where c.classid=cn.classid)) as classname");
+        List<String> infoFields = new ArrayList<>();
+        infoFields.add("classid");
+        infoFields.add("classname");
+
+        String gradeField = "dwname,dworder,dwscore,sxnum,ljsnum,ljsxrate";
+        sql.append(",").append(gradeField);
+        String[] gradeFields = gradeField.split(",");
+        sql.append(" from msr_class_nearline cn ");
+        List<Map> list = msrClassNearlineMapper.listClassForFdSx(sql.toString(), params);
+        List<Map<String, Object>> data = formatList(params, list, infoFields, gradeFields);
+        Map<String, Object> map = msrExamMapper.getFullAndMaxScoreByExamId(params.getExamid());
+        map.put("list", data);
+        return map;
+    }
+
+    /**
+     * @Description 学科分档上线-列表
+     * @Date 2025/1/10 11:34
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public Object listClassForFdSxXk(StudentParams params) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("cn.classid");
+        sql.append(",if(cn.classid=0,'全体',(select c.classname from t_class c where c.classid=cn.classid)) as classname");
+        sql.append(",if(cn.subjectid='zf','总分',(select s.subjectname from t_subject s where s.subjectid=cn.subjectid)) as subjectname");
+        List<String> infoFields = new ArrayList<>();
+        infoFields.add("classid");
+        infoFields.add("classname");
+
+        String gradeField = "subjectid,dwscore,sxnum,ssxnum,gxrate,mzxrate";
+        sql.append(",").append(gradeField);
+        String[] gradeFields = gradeField.split(",");
+        sql.append(" from msr_class_nearline cn ");
+        List<String> fields = new ArrayList<>();
+        fields.add("subjectname");
+        Collections.addAll(fields, gradeFields);
+        gradeFields = fields.toArray(new String[0]);
+        List<Map> list = msrClassNearlineMapper.listClassForFdSx(sql.toString(), params);
+        return formatList(params, list, infoFields, gradeFields);
+    }
 }

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

@@ -2,8 +2,10 @@ 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.model.report.reportstu.MsrStudent;
 import com.xhkjedu.smarking.utils.MarkingUtil;
 import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
+import com.xhkjedu.smarking.vo.report.reportother.ScoreGroupVo;
 import com.xhkjedu.smarking.vo.report.reportstu.LabelVo;
 import com.xhkjedu.smarking.vo.report.reportstu.StudentParams;
 import com.xhkjedu.utils.N_Utils;
@@ -137,4 +139,42 @@ public class MsrStudentService {
         labels.add(new LabelVo("超均率", 2, "cjl"));
         return labels;
     }
+
+    /**
+     * @Description 校级报告-总分分布
+     * @Date 2025/1/10 17:29
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public Object listScoreForZfFb(StudentParams params) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("s.fullscore,s.stuscore,s.studentid");
+        sql.append(" from msr_student s ");
+        sql.append(" where s.examid=").append(params.getExamid());
+        sql.append(" and s.subjectid='zf'");
+        sql.append(" group by s.studentid");
+        List<MsrStudent> list = msrStudentMapper.listStudentBySql(sql.toString());
+        if (N_Utils.isListEmpty(list)) {
+            return new ArrayList<>();
+        }
+        Double fullscore = list.get(0).getFullscore();
+        int totalNum = list.size();
+        List<ScoreGroupVo> groups = MarkingUtil.scoreGroup(fullscore, 12);
+        long num;
+        for (ScoreGroupVo group : groups) {
+            Double minvalue = group.getMinvalue();
+            Double maxvalue = group.getMaxvalue();
+            if (minvalue.equals(0.0)) {
+                num = list.stream().filter(s -> s.getStuscore().compareTo(maxvalue) < 0).count();
+            } else if (maxvalue.equals(fullscore)) {
+                num = list.stream().filter(s -> s.getStuscore().compareTo(minvalue) >= 0).count();
+            } else {
+                num = list.stream().filter(s -> s.getStuscore().compareTo(minvalue) >= 0 && s.getStuscore().compareTo(maxvalue) < 0).count();
+            }
+            group.setNum((int) num);
+            group.setNumrate(N_Utils.getIntegerDivideAndMulitiply(group.getNum(), totalNum));
+        }
+        return groups;
+    }
 }

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

@@ -1,14 +1,16 @@
 package com.xhkjedu.smarking.service.report.report;
 
 import com.xhkjedu.smarking.mapper.report.reportclass.MsrClassSubjectGradeMapper;
+import com.xhkjedu.smarking.mapper.report.reportother.MsrExamMapper;
 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 com.xhkjedu.smarking.vo.report.reportstu.StudentParams;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.LinkedHashMap;
-import java.util.Map;
+import java.util.*;
 
 /**
  *@Description 科目报告查询服务
@@ -23,6 +25,8 @@ public class MsrSubjectService {
     private MsrStudentMapper msrStudentMapper;
     @Resource
     private MsrClassSubjectGradeMapper msrClassSubjectGradeMapper;
+    @Resource
+    private MsrExamMapper msrExamMapper;
 
     /**
      * @Description 总概览
@@ -42,4 +46,39 @@ public class MsrSubjectService {
         map.put("scorerates", msrClassSubjectGradeMapper.getZfScoreRate(examid));
         return map;
     }
+
+    /**
+     * @Description 总分基本情况成绩分析
+     * @Date 2025/1/10 15:00
+     * @Author YWX
+     * @Param [examid]
+     * @Return java.util.Map
+     **/
+    public Map getExamForHzZf(Integer examid) {
+        return msrExamMapper.getExamForHzZf(examid);
+    }
+
+    /**
+     * @Description 总体情况汇总分析-各学科基本数据对比情况
+     * @Date 2025/1/10 15:05
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public Object listSubjectForHzXk(StudentParams params) {
+        StringBuilder sql = new StringBuilder();
+        sql.append("s.subjectid,s.subjectname,s.stunum,s.fullscore,s.maxscore,s.minscore,s.avgscore,s.bzc,s.cyxs,s.nd,s.axdxs");
+        sql.append(" from msr_subject s ");
+        sql.append(" where s.examid = " + params.getExamid());
+        String fieldname = params.getFieldname();
+        if (N_Utils.isNotEmpty(fieldname)) {
+            Integer od = params.getOd();
+            String order = "desc";
+            if (N_Utils.isTrueInteger(od) && od.equals(1)) {
+                order = "asc";
+            }
+            sql.append(" order by ").append(fieldname).append(" ").append(order);
+        }
+        return msrSubjectMapper.listSubjectBySql(sql.toString());
+    }
 }

smarking/src/main/java/com/xhkjedu/smarking/service/report/reportother/MsrExamService.java

@@ -138,8 +138,10 @@ public class MsrExamService {
         msrExam.setStunum(msrSubject.getStunum());
         msrExam.setMissnum(msrSubject.getMissnum());
         msrExam.setSubjectnum(subjectnum);
+        msrExam.setFullscore(msrSubject.getFullscore());
         msrExam.setMaxscore(msrSubject.getMaxscore());
         msrExam.setMinscore(msrSubject.getMinscore());
+        msrExam.setAvgscore(msrSubject.getAvgscore());
         msrExam.setBzc(msrSubject.getBzc());
         msrExam.setCreatetime(N_Utils.getSecondTimestamp());
         msrExamMapper.insert(msrExam);

smarking/src/main/java/com/xhkjedu/smarking/utils/MarkingUtil.java

@@ -7,8 +7,7 @@ import com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 import com.xhkjedu.smarking.vo.paper.PaperFileVo;
-import com.xhkjedu.smarking.vo.report.reportother.RankGroupVo;
-import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
+import com.xhkjedu.smarking.vo.report.reportother.*;
 import com.xhkjedu.smarking.vo.report.reportsubject.SectionScoreVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.PageResult;
@@ -655,6 +654,32 @@ public class MarkingUtil {
         return rtnList;
     }
 
+    //分数分组
+    public static List<ScoreGroupVo> scoreGroup(Double fullScore, Integer groupNum) {
+        List<ScoreGroupVo> groups = new ArrayList<>();
+        double groupScore = Math.ceil(fullScore / groupNum);
+        double min = 0;
+        double max;
+        String start = "[";
+        String end = ")";
+        for (int i = 1; i <= groupNum; i++) {
+            ScoreGroupVo vo = new ScoreGroupVo();
+            max = min + groupScore;
+            if (i == groupNum) {
+                if (max > fullScore) {
+                    max = fullScore;
+                }
+                end = "]";
+            }
+            vo.setGroupname(start + N_Utils.formatDouble(min) + "," + N_Utils.formatDouble(max) + end);
+            vo.setMinvalue(min);
+            vo.setMaxvalue(max);
+            groups.add(vo);
+            min = max;
+        }
+        return groups;
+    }
+
     //处于年级20%得分(v=0.2)
     public static Double cynjdf(List<Double> scores, double v) {
         if (N_Utils.isListEmpty(scores)) return 0.0;

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

@@ -0,0 +1,17 @@
+package com.xhkjedu.smarking.vo.report.reportother;
+
+import lombok.Data;
+
+/**
+ * @Description 分数分组
+ * @Author YWX
+ * @Date 2025/1/10 16:48
+ **/
+@Data
+public class ScoreGroupVo {
+    private String groupname; //组名
+    private Double maxvalue;//最大值
+    private Double minvalue;//最小值
+    private Integer num;//人数
+    private Double numrate;//人数占比
+}

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

@@ -25,4 +25,5 @@ public class StudentParams extends BaseBean {
     private Integer od;//标识排序类型1升序2降序
     private Integer type;//分段类型（1分段统计 2累计统计）
     private String reportcode;//归属报告模块编码
+    private Integer dworder;//档位序号
 }

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

@@ -1,4 +1,20 @@
 <?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.MsrClassNearlineMapper">
+    <!--分档上线-列表-->
+    <select id="listClassForFdSx" resultType="java.util.Map">
+        select ${sql}
+        where examid=#{params.examid}
+        <if test="params.subjectid!= null and params.subjectid!= ''">
+            and subjectid=#{params.subjectid}
+        </if>
+        <if test="params.classids!= null and params.classids.size() > 0">
+            <foreach collection="params.classids" item="classid" open="and classid in (" close=")" separator=",">
+                #{classid}
+            </foreach>
+        </if>
+        <if test="params.dworder!= null and params.dworder!= 0">
+            and dworder=#{params.dworder}
+        </if>
+    </select>
 </mapper>

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

@@ -26,4 +26,13 @@
         delete from msr_subject_question_rankgroup where examid = #{examid};
         delete from msr_subject_question_section where examid = #{examid};
     </delete>
+    <!--获取单次考试的总分和最高分-->
+    <select id="getFullAndMaxScoreByExamId" resultType="java.util.Map">
+        select fullscore,maxscore from msr_exam where examid = #{examid} limit 1
+    </select>
+    <!--总分基本情况成绩分析-->
+    <select id="getExamForHzZf" resultType="java.util.Map">
+        select stunum,classnum,fullscore,maxscore,minscore,avgscore,bzc
+        from msr_exam where examid = #{examid} limit 1
+    </select>
 </mapper>

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

@@ -81,4 +81,8 @@
             #{classid}
         </foreach>
     </select>
+    <!--学生成绩分析-->
+    <select id="listStudentBySql" resultType="com.xhkjedu.smarking.model.report.reportstu.MsrStudent">
+        select ${sql}
+    </select>
 </mapper>

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

@@ -16,5 +16,9 @@
         from msr_subject
         where examid=#{examid}
     </select>
+    <!--科目分析列表-->
+    <select id="listSubjectBySql" resultType="java.util.Map">
+        select ${sql}
+    </select>
 
 </mapper>