From ebb1a448339bafc4c4849fdbc2291bd3a28261df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 09 一月 2024 10:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
index 22ad078..071f739 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/IBaseCaseService.java
@@ -11,12 +11,14 @@
import com.ycl.entity.caseHandler.BaseCaseDetail;
import com.ycl.vo.casePool.BaseCaseVO;
import com.ycl.vo.casePool.QueryForViolationVO;
+import com.ycl.vo.casePool.WorkOrderVO;
import com.ycl.vo.cockpit.enforcementEvents.DelayVO;
import com.ycl.vo.cockpit.enforcementEvents.EventVO;
import com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -39,9 +41,9 @@
*/
String uploadEvent(Long caseId);
- Page listViolationsPage(Integer size, Integer current, Integer state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
+ Page listViolationsPage(Integer size, Integer current, List<Integer> state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId);
- Page listIllegalBuilding(Integer current, Integer size, Integer state, Integer resource);
+ Page listIllegalBuilding(Integer current, Integer size, List<Integer> state, Integer resource);
Boolean saveViolationCase(ViolationParam violationParam, Long id);
@@ -91,4 +93,8 @@
List<DelayVO> selectDelayList();
Map<String, Object> statistics();
+
+ IPage<WorkOrderVO> getWorkOrder(Integer current, Integer pageSize, String keyword);
+
+ List<WorkOrderVO> getWorkOrderList(String keyword);
}
--
Gitblit v1.8.0