From a4cd4c2d98392cd1036f36b96c262878743a7e63 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 05 九月 2024 19:52:22 +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 | 11 +++++------
1 files changed, 5 insertions(+), 6 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 94f9a67..6086cf7 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
@@ -6,10 +6,7 @@
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.cockpitManage.DelayDO;
import com.ycl.entity.caseHandler.BaseCase;
-import com.ycl.vo.casePool.BaseCaseVO;
-import com.ycl.vo.casePool.CasePoolIllegalBuildingVO;
-import com.ycl.vo.casePool.CasePoolViolationVO;
-import com.ycl.vo.casePool.QueryForViolationVO;
+import com.ycl.vo.casePool.*;
import com.ycl.vo.cockpit.enforcementEvents.EventVO;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import org.apache.ibatis.annotations.Param;
@@ -27,9 +24,9 @@
* @since 2022-09-24
*/
public interface BaseCaseMapper extends BaseMapper<BaseCase> {
- Page<CasePoolViolationVO> listViolationsPage(Page page, Integer state, Integer type, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
+ Page<CasePoolViolationVO> listViolationsPage(Page page, List<Integer> state, Integer type, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
- Page<CasePoolIllegalBuildingVO> listIllegalBuildingsPage(Page page, Integer state, Integer type, Integer resource);
+ Page<CasePoolIllegalBuildingVO> listIllegalBuildingsPage(Page page, List<Integer> state, Integer type, Integer resource);
BaseCase selectCondMap(Map map);
@@ -70,4 +67,6 @@
Long selectOnTimeCaseLastMonthCount();
Long selectOnTimeCaseRecentlyMonthCount();
+
+ IPage<WorkOrderVO> getWorkOrder(IPage<WorkOrderVO> page, String keyword);
}
--
Gitblit v1.8.0