冲突解决

src/main/java/com/qmth/exam/reserve/dao/StudentApplyDao.java

@@ -17,7 +17,8 @@ public interface StudentApplyDao extends BaseMapper<StudentApplyEntity> {
 
     IPage<StudentApplyVO> page(Page<StudentApplyVO> page, @Param(value = "req") StudentApplyReq req);
 
-    Integer getHaveApplyCount(@Param(value = "examSiteIds") List<Long> examSiteIds);
+    Integer getHaveApplyCount(@Param(value = "examSiteIds") List<Long> examSiteIds,
+            @Param(value = "cancel") Boolean cancel);
 
     List<ApplyVO> getStudentApplyList(@Param("studentId") Long studentId, @Param("cancel") Boolean cancel);