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

scommons/src/main/java/com/xhkjedu/utils/N_Utils.java

@@ -1,6 +1,7 @@
 package com.xhkjedu.utils;
 
 import com.xhkjedu.exception.MissingParametersException;
+import com.xhkjedu.exception.ServiceException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.util.CollectionUtils;
@@ -463,18 +464,23 @@ public class N_Utils {
      * @return void
      **/
     public static void validation(Object[] strs) {
-        for (int i = 0; i < strs.length; i+=3) {
+        for (int i = 0; i < strs.length; i += 3) {
             Object filename = strs[i];
-            String msg = strs[i+1].toString()+"不能为空";
-            Integer type = Integer.parseInt(strs[i+2].toString());
-            if(type == 1){//Integer类型参数
+            String msg = strs[i + 1].toString() + "不能为空";
+            Integer type = Integer.parseInt(strs[i + 2].toString());
+            if (type == 1) {//Integer类型参数
                 if (!N_Utils.isNotEmpty(filename) || filename.equals(0)) {
                     throw new MissingParametersException(msg);
                 }
-            } else {//String类型参数
+            } else if (type == 2) {//String类型参数
                 if (!N_Utils.isNotEmpty(filename)) {
                     throw new MissingParametersException(msg);
                 }
+            } else if (type == 3) {// List类型参数
+                List list = (List) filename;
+                if (!isListNotEmpty(list)) {
+                    throw new ServiceException(msg);
+                }
             }
         }
     }

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

@@ -4,10 +4,12 @@ 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.model.report.reportstu.MsrStudent;
 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.smarking.vo.report.reportstu.StudentParams;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
 import com.xhkjedu.vo.PageResult;
@@ -38,6 +40,8 @@ public class ZhReportController {
     private MsrSubjectService msrSubjectService;
     @Resource
     private MsrActionService msrActionService;
+    @Resource
+    private MsrClassService msrClassService;
 
     /**
      * @Description 总概览
@@ -52,6 +56,29 @@ public class ZhReportController {
         return new ResultVo(0, "获取成功", msrSubjectService.listSubjectForZgl(subject));
     }
 
+    /**
+     * @Description 排行榜
+     * @Date 2025/1/6 9:11
+     * @Author YWX
+     * @Param [params]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @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.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);
+    }
+
     /*
      * @Description 小分表-列表
      * @Date 2024/12/24 10:25:06

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

@@ -3,6 +3,7 @@ package com.xhkjedu.smarking.mapper.report.reportstu;
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportstu.MsrStudent;
 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;
@@ -24,4 +25,7 @@ public interface MsrStudentMapper extends TkMapper<MsrStudent> {
     List<Map<String, Object>> listStuSubjectQuestions(@Param("params") ExamReportParams params);
     //综合报告-总概览-整体分数分布分析
     List<Map<String, Object>> listScoreForZgl(@Param("examid") Integer examid,@Param("subjectid") String subjectid);
+
+    //综合报告-排行榜
+    List<Map> listStudentForPhb(@Param("sql") String sql,@Param("params") StudentParams params);
 }

smarking/src/main/java/com/xhkjedu/smarking/model/report/reportstu/MsrStudentAction.java

@@ -5,6 +5,7 @@ import lombok.Data;
 
 import javax.persistence.Id;
 import javax.persistence.Table;
+import java.util.List;
 
 /**
  * @Description 考试报告学生违纪优秀分析表
@@ -29,4 +30,6 @@ public class MsrStudentAction extends BaseBean {
     private Integer actiontype;
     //科目信息
     private String subjectjson;
+    //班级ids
+    private List<Integer> classids;
 }

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

@@ -2,7 +2,9 @@ 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.vo.report.reportother.ExamReportParams;
+import com.xhkjedu.smarking.vo.report.reportstu.StudentParams;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -36,5 +38,51 @@ public class MsrStudentService {
         return msrStudentPointMapper.listStuPoints(params);
     }
 
-
+    /**
+     * @Description 综合报告-排行榜
+     * @Date 2025/1/6 9:12
+     * @Author YWX
+     * @Param [params]
+     * @Return java.lang.Object
+     **/
+    public List<Map> listStudentForPhb(StudentParams params) {
+        List<String> fields = params.getFields();
+        StringBuilder sql = new StringBuilder();
+        sql.append("s.rsid");
+        boolean user = false;
+        if (fields.contains("姓名")) {
+            sql.append(",u.username as studentname");
+            user = true;
+        }
+        if (fields.contains("考号")) {
+            sql.append(",u.examno");
+            user = true;
+        }
+        if (fields.contains("学号")) {
+            sql.append(",u.studentno");
+            user = true;
+        }
+        if (fields.contains("班级")) {
+            sql.append(",(select c.classname from t_class c where c.classid=s.classid) as classname");
+        }
+        if (fields.contains("分数")) {
+            sql.append(",s.stuscore");
+        }if (fields.contains("等级")) {
+            sql.append(",s.gradevalue");
+        }if (fields.contains("学校排名")) {
+            sql.append(",s.schoolrank");
+        }if (fields.contains("班级排名")) {
+            sql.append(",s.classrank");
+        }if (fields.contains("标准分")) {
+            sql.append(",s.bzf");
+        }if (fields.contains("超均率")) {
+            sql.append(",s.cjl");
+        }
+        sql.append(" from msr_student s ");
+        if (user) {
+            sql.append(" inner join t_user u on s.studentid=u.userid ");
+        }
+        List<Map> list=msrStudentMapper.listStudentForPhb(sql.toString(), params);
+        return list;
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.xhkjedu.smarking.vo.report.reportstu;
+
+import com.xhkjedu.model.BaseBean;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description 学生成绩参数类
+ * @Author YWX
+ * @Date 2025/1/6 9:42
+ **/
+@Data
+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;//指标字段
+}

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

@@ -25,7 +25,7 @@
     <!--行为分析-班级-->
     <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
+        from msr_class_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}

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

@@ -17,7 +17,7 @@
     <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'
+        where examid = #{examid} and reportcode = 'zh' and classid = 0 and subjectid = 'zf'
     </select>
 
 </mapper>

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

@@ -72,4 +72,15 @@
         where examid=#{examid} and subjectid=#{subjectid}
         group by stuscore
     </select>
+    <!--综合报告-排行榜-->
+    <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>
+    </select>
 </mapper>