Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.java

@@ -31,7 +31,7 @@
    * @param page  分页
    * @return
    */
   List<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction);
   List<ExamScoreVO> scorePage(IPage page,String deptid,String jurisdiction,String realName);

   /**
    * 自定义分页-模拟考试
@@ -65,4 +65,12 @@
    * @return
    */
    int updateByIdAndQualifiee(@Param("examScore") ExamScore examScore);

   /**
    * 考试合格人数对比
    * @param deptid
    * @param jurisdiction
    * @return
    */
   List<Object> scoreStat(String deptid, String jurisdiction);
}