Merge remote-tracking branch 'origin/master'

zengh

2021-12-04 2fdf30b77e0614f4785c7893a01958e8c8db8545

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -85,8 +85,8 @@
    * @return
    */
   @Override
   public IPage<ExamScoreVO> scorePage(IPage<ExamScoreVO> page,String deptid,String jurisdiction) {
      return page.setRecords(baseMapper.scorePage(page,deptid,jurisdiction));
   public IPage<ExamScoreVO> scorePage(IPage<ExamScoreVO> page,String deptid,String jurisdiction,String realName) {
      return page.setRecords(baseMapper.scorePage(page,deptid,jurisdiction,realName));
   }

   /**
@@ -343,4 +343,15 @@
      }
      return false;
   }

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