综合报告-排行榜-列表

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

@@ -57,7 +57,7 @@ public class ZhReportController {
     }
 
     /**
-     * @Description 排行榜
+     * @Description 排行榜-列表
      * @Date 2025/1/6 9:11
      * @Author YWX
      * @Param [params]
@@ -65,18 +65,13 @@ public class ZhReportController {
      **/
     @PostMapping("/phb")
     public ResultVo listStudentForPhb(@RequestBody StudentParams params) {
-        Integer page = params.getPage();
-        Integer pageSize = params.getPageSize();
         N_Utils.validation(new Object[]{
                 params.getExamid(), "考试id", 1
-                , params.getClassids(), "班级", 2
+                , params.getSubjectid(), "科目", 3
+                , params.getClassids(), "班级", 3
                 , params.getFields(), "指标", 3
-                , page, "显示页码", 1, pageSize, "显示条数", 1
         });
-        PageHelper.startPage(page, pageSize);
-        List<Map> list = msrStudentService.listStudentForPhb(params);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
-        return new ResultVo(0, "获取成功", pageResult);
+        return new ResultVo(0, "获取成功", msrStudentService.listStudentForPhb(params));
     }
 
     /*

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

@@ -6,8 +6,7 @@ import com.xhkjedu.smarking.vo.report.reportother.ExamReportParams;
 import com.xhkjedu.smarking.vo.report.reportstu.StudentParams;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description 阅卷报告-学生成绩分析表 Mapper 接口
@@ -27,5 +26,5 @@ public interface MsrStudentMapper extends TkMapper<MsrStudent> {
     List<Map<String, Object>> listScoreForZgl(@Param("examid") Integer examid,@Param("subjectid") String subjectid);
 
     //综合报告-排行榜
-    List<Map> listStudentForPhb(@Param("sql") String sql,@Param("params") StudentParams params);
+    List<Map> listStudentForPhb(@Param("sql") String sql, @Param("params") StudentParams params);
 }

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

@@ -2,14 +2,15 @@ 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.reportstu.StudentParams;
+import com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description：学生报告信息
@@ -24,17 +25,17 @@ public class MsrStudentService {
     private MsrStudentPointMapper msrStudentPointMapper;
 
     //综合报告-小分表-列表
-    public List<Map<String,Object>> listStuScoreAndRank(Integer examid, String subjectid){
-        return msrStudentMapper.listStuScoreAndRankByExamidAndSubjectid(examid,subjectid);
+    public List<Map<String, Object>> listStuScoreAndRank(Integer examid, String subjectid) {
+        return msrStudentMapper.listStuScoreAndRankByExamidAndSubjectid(examid, subjectid);
     }
 
     //学生报告-学生各学科试题分析
-    public List<Map<String,Object>> listStuSubjectQuestions(ExamReportParams params){
+    public List<Map<String, Object>> listStuSubjectQuestions(ExamReportParams params) {
         return msrStudentMapper.listStuSubjectQuestions(params);
     }
 
     //学生报告-学生各学科知识点分析
-    public List<Map<String,Object>> listStuPoints(ExamReportParams params){
+    public List<Map<String, Object>> listStuPoints(ExamReportParams params) {
         return msrStudentPointMapper.listStuPoints(params);
     }
 
@@ -45,44 +46,101 @@ public class MsrStudentService {
      * @Param [params]
      * @Return java.lang.Object
      **/
-    public List<Map> listStudentForPhb(StudentParams params) {
+    public Object listStudentForPhb(StudentParams params) {
         List<String> fields = params.getFields();
         StringBuilder sql = new StringBuilder();
-        sql.append("s.rsid");
-        boolean user = false;
+        sql.append("s.studentid,s.subjectid,s.classid");
+        sql.append(",if(s.subjectid='zf','总分',(select ts.subjectname from t_subject ts where ts.subjectid=s.subjectid)) as subjectname");
+        boolean showClass = false;
+        List<String> userFields = new ArrayList<>();
+        List<String> subjectFields = new ArrayList<>();
         if (fields.contains("姓名")) {
             sql.append(",u.username as studentname");
-            user = true;
+            userFields.add("studentname");
         }
         if (fields.contains("考号")) {
             sql.append(",u.examno");
-            user = true;
+            userFields.add("examno");
         }
         if (fields.contains("学号")) {
             sql.append(",u.studentno");
-            user = true;
+            userFields.add("studentno");
         }
         if (fields.contains("班级")) {
             sql.append(",(select c.classname from t_class c where c.classid=s.classid) as classname");
+            showClass = true;
         }
         if (fields.contains("分数")) {
             sql.append(",s.stuscore");
-        }if (fields.contains("等级")) {
+            subjectFields.add("stuscore");
+        }
+        if (fields.contains("等级")) {
             sql.append(",s.gradevalue");
-        }if (fields.contains("学校排名")) {
+            subjectFields.add("gradevalue");
+        }
+        if (fields.contains("学校排名")) {
             sql.append(",s.schoolrank");
-        }if (fields.contains("班级排名")) {
+            subjectFields.add("schoolrank");
+        }
+        if (fields.contains("班级排名")) {
             sql.append(",s.classrank");
-        }if (fields.contains("标准分")) {
+            subjectFields.add("classrank");
+        }
+        if (fields.contains("标准分")) {
             sql.append(",s.bzf");
-        }if (fields.contains("超均率")) {
+            subjectFields.add("bzf");
+        }
+        if (fields.contains("超均率")) {
             sql.append(",s.cjl");
+            subjectFields.add("cjl");
         }
         sql.append(" from msr_student s ");
-        if (user) {
+        if (N_Utils.isListNotEmpty(userFields)) {
             sql.append(" inner join t_user u on s.studentid=u.userid ");
+            String studentname = params.getStudentname();
+            if (N_Utils.isNotEmpty(studentname)) {
+                sql.append(" and (u.username like '%").append(studentname).append("%'");
+                sql.append(" or u.examno like '%").append(studentname).append("%'");
+                sql.append(" or u.studentno like '%").append(studentname).append("%')");
+            }
+        }
+        List<Map> list = msrStudentMapper.listStudentForPhb(sql.toString(), params);
+        Map<String, List<Map>> collect = list.stream().collect(Collectors.groupingBy(
+                m -> m.get("studentid") + "_" + m.get("classid"), LinkedHashMap::new, Collectors.toList()));
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Map.Entry<String, List<Map>> entry : collect.entrySet()) {
+            List<Map> values = entry.getValue();
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("studentid", entry.getKey().split("_")[0]);
+            for (String field : userFields) {
+                map.put(field, values.get(0).get(field));
+            }
+            if (showClass) {
+                map.put("classname", values.get(0).get("classname"));
+            }
+            List<LinkedHashMap> subjectList = new ArrayList<>();
+            for (Map m : values) {
+                LinkedHashMap<String, Object> subjectMap = new LinkedHashMap<>();
+                subjectMap.put("subjectid", m.get("subjectid"));
+                subjectMap.put("subjectname", m.get("subjectname"));
+                for (String field : subjectFields) {
+                    subjectMap.put(field, m.get(field));
+                }
+                subjectList.add(subjectMap);
+            }
+            map.put("subjectList", subjectList);
+            result.add(map);
+        }
+
+        String fieldname = params.getFieldname();
+        if (N_Utils.isNotEmpty(fieldname)) {
+            result = MarkingUtil.sortBySubjectField(result, params.getSubjectid(), fieldname, params.getOd());
+        }
+        if (N_Utils.isTrueInteger(params.getPage())) {
+            return MarkingUtil.getPageResult(params.getPage(), params.getPageSize(), result);
+        } else {
+            return result;
         }
-        List<Map> list=msrStudentMapper.listStudentForPhb(sql.toString(), params);
-        return list;
     }
+
 }

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

@@ -11,6 +11,7 @@ import com.xhkjedu.smarking.vo.report.reportother.RankGroupVo;
 import com.xhkjedu.smarking.vo.report.reportother.SzJsonVo;
 import com.xhkjedu.smarking.vo.report.reportsubject.SectionScoreVo;
 import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.PageResult;
 import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 
@@ -458,7 +459,7 @@ public class MarkingUtil {
     }
 
     //计算占比，保留4为小数，乘以100后2位小数
-    public static double calculateRate(Object v1,Object v2){
+    public static double calculateRate(Object v1, Object v2) {
         BigDecimal b1 = new BigDecimal(v1.toString());
         BigDecimal b2 = new BigDecimal(v2.toString());
 
@@ -549,7 +550,7 @@ public class MarkingUtil {
     }
 
     //排名分组计算 参数[总名次，分组数] 如：第一组(第1-10名)
-    public static List<RankGroupVo> rankGroup(Integer total,Integer groupNum) {
+    public static List<RankGroupVo> rankGroup(Integer total, Integer groupNum) {
         List<RankGroupVo> rtnList = new ArrayList<>();
         if (groupNum > total) groupNum = total;
 
@@ -586,7 +587,7 @@ public class MarkingUtil {
     }
 
     //分数排名
-    public static Map<Double,Integer> fspm(List<Double> scores) {
+    public static Map<Double, Integer> fspm(List<Double> scores) {
         //倒序排
         scores.sort(Collections.reverseOrder());
         // 创建一个地图来存储分数和出现次数
@@ -603,7 +604,7 @@ public class MarkingUtil {
     }
 
     //人数排名
-    public static Map<Integer,Integer> rspm(List<Integer> nums) {
+    public static Map<Integer, Integer> rspm(List<Integer> nums) {
         //倒序排
         nums.sort(Collections.reverseOrder());
         // 创建一个地图来存储分数和出现次数
@@ -676,16 +677,16 @@ public class MarkingUtil {
     }
 
     // 分数段 分数分段
-    public static List<RankGroupVo> fdScore(Double totalScore,int fdscore){
+    public static List<RankGroupVo> fdScore(Double totalScore, int fdscore) {
         List<RankGroupVo> rtnList = new ArrayList<>();
         for (int i = 0; i < totalScore; i += fdscore) {
             int end = (int) Math.min(i + fdscore, totalScore);
 
             String groupname = "[" + i + "~" + end;
-            if(end == totalScore){
-                groupname+="]";
-            }else {
-                groupname+=")";
+            if (end == totalScore) {
+                groupname += "]";
+            } else {
+                groupname += ")";
             }
 
             RankGroupVo rgvo = new RankGroupVo();
@@ -696,11 +697,12 @@ public class MarkingUtil {
         }
         return rtnList;
     }
+
     //分数分段 试题1分1段
-    public static List<SectionScoreVo> fdScoreForOne(Double totalScore){
+    public static List<SectionScoreVo> fdScoreForOne(Double totalScore) {
         List<SectionScoreVo> rtnList = new ArrayList<>();
-        for (int i = 0; i < totalScore; i ++) {
-            double end = Math.min(i+1, totalScore);
+        for (int i = 0; i < totalScore; i++) {
+            double end = Math.min(i + 1, totalScore);
             SectionScoreVo rgvo = new SectionScoreVo();
             rgvo.setSectionname("[" + i + "~" + end + ")");
             rgvo.setMinvalue(i);
@@ -735,6 +737,7 @@ public class MarkingUtil {
     }
 
     private static int index = 0;
+
     //根据表达式计算
     public static double evaluate(String expression) {
         index = 0;
@@ -826,7 +829,7 @@ public class MarkingUtil {
 
     //获取报告参数
     public static List<MsrReportparam> getMsrReportParams(MsrReportparamMapper msrReportparamMapper
-            ,Integer examid, String rpbelong, String reportcode) {
+            , Integer examid, String rpbelong, String reportcode) {
         List<MsrReportparam> list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, reportcode);
         if (N_Utils.isListEmpty(list) && !"all".equals(reportcode)) {
             list = msrReportparamMapper.listReportparamByRpbelong(examid, rpbelong, "all");
@@ -834,11 +837,74 @@ public class MarkingUtil {
         return list;
     }
 
+    // 获取指定字段的值
+    public static double getFieldValueAsDouble(Map<String, Object> subject, String field) {
+        Object value = subject.get(field);
+        if (value instanceof Number) {
+            return ((Number) value).doubleValue();
+        } else if (value instanceof String && isNumeric((String) value)) {
+            return Double.parseDouble((String) value);
+        }
+        throw new IllegalArgumentException("Unknown or non-numeric field: " + field);
+    }
+
+    // 判断字符串是否为数字
+    public static boolean isNumeric(String strNum) {
+        if (strNum == null) {
+            return false;
+        }
+        try {
+            Double.parseDouble(strNum);
+        } catch (NumberFormatException nfe) {
+            return false;
+        }
+        return true;
+    }
+
+    // 根据指定科目字段排序
+    public static List<Map<String, Object>> sortBySubjectField(List<Map<String, Object>> students
+            , String subjectid, String field, Integer od) {
+        if ("classname".equals(field)) {
+            if (od.equals(2)) {//降序
+                return students.stream().sorted(Comparator.comparing(student -> student.get("classname").toString(), Comparator.nullsLast(Comparator.reverseOrder()))).collect(Collectors.toList());
+            } else {//升序
+                return students.stream().sorted(Comparator.comparing(student -> student.get("classname").toString(), Comparator.nullsLast(Comparator.naturalOrder()))).collect(Collectors.toList());
+            }
+        }
+        Comparator<Map<String, Object>> studentComparator = Comparator.comparingDouble((Map<String, Object> student) -> {
+            // 获取并转换subjectList为List<Map<String, Object>>
+            @SuppressWarnings("unchecked")
+            List<Map<String, Object>> subjectList = (List<Map<String, Object>>) student.get("subjectList");
+
+            // 查找与subjectid匹配的第一个科目，并根据field获取其值
+            return subjectList.stream()
+                              .filter(subject -> subjectid.equals(subject.get("subjectid")))
+                              .mapToDouble(subject -> MarkingUtil.getFieldValueAsDouble(subject, field))
+                              .findFirst().orElse(Double.NaN);
+        }); // 如果是数值型字段，通常希望降序排列
+        if (od.equals(2)) {
+            studentComparator = studentComparator.reversed();
+        }
+
+        // 对学生列表进行排序
+        return students.stream().sorted(studentComparator).collect(Collectors.toList());
+    }
+
+    //分页
+    public static PageResult getPageResult(Integer page, Integer pageSize, List<?> list) {
+        int start = (page - 1) * pageSize;
+        PageResult pageResult = new PageResult();
+        pageResult.setTotal(list.size());
+        list = list.stream().skip(start).limit(pageSize).collect(Collectors.toList());
+        pageResult.setList(list);
+        return pageResult;
+    }
+
     public static void main(String[] args) {
-       List<RankGroupVo> list = fdScore(1.0,5);
-       for (RankGroupVo rgvo : list) {
-           System.out.println(rgvo.getGroupname() + ";" + rgvo.getMinvalue() + "-" + rgvo.getMaxvalue());
+        List<RankGroupVo> list = fdScore(1.0, 5);
+        for (RankGroupVo rgvo : list) {
+            System.out.println(rgvo.getGroupname() + ";" + rgvo.getMinvalue() + "-" + rgvo.getMaxvalue());
 
-       }
+        }
     }
 }

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

@@ -14,14 +14,12 @@ import java.util.List;
 public class StudentParams extends BaseBean {
 
     private Integer examid;//考试ID
-
     private String subjectid;//科目ID
-
     private List<String> subjectids;//科目ID
-
     private Integer classid;//班级ID
-
     private List<Integer> classids;//多个班级id
-
     private List<String> fields;//指标字段
+    private String studentname;//姓名
+    private String fieldname;//排序字段
+    private Integer od;//标识排序类型1升序2降序
 }

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

@@ -76,9 +76,6 @@
     <select id="listStudentForPhb" resultType="java.util.Map">
         select ${sql}
         where s.examid=#{params.examid}
-        <foreach collection="params.classids" item="classid" open="and s.classid in(" separator="," close=")">
-            ${classid}
-        </foreach>
         <foreach collection="params.subjectids" item="subjectid" open="and s.subjectid in(" separator="," close=")">
             #{subjectid}
         </foreach>