From dfea866e55c725bd601ff84c92dff30f83057571 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 30 三月 2023 19:56:59 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
index 51338a5..a5d9330 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/caseHandler/BaseCaseMapper.java
@@ -1,6 +1,7 @@
 package com.ycl.mapper.caseHandler;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ycl.dto.caseHandler.QueryForViolationParam;
 import com.ycl.dto.cockpitManage.DelayDO;
@@ -37,7 +38,7 @@
 
     List<QueryForViolationVO> selectViolationPage(@Param(value = "queryForViolationParam") QueryForViolationParam queryForViolationParam);
 
-    Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage);
+    Page<BaseCaseVO> selectVideoInspection(Page<Object> objectPage, @Param("gradeId") Long gradeId, @Param("videoId") Long videoId, @Param("beginTime") String beginTime, @Param("endTime") String endTime);
 
     Integer dayCount();
 
@@ -45,7 +46,7 @@
 
     Integer dispatchCount();
 
-    List<EventVO> selectEventList(String beginTime, String endTime);
+    IPage<EventVO> selectEventList(IPage<EventVO> page, String beginTime, String endTime);
 
     Integer alCount();
 

--
Gitblit v1.8.0