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/service/caseHandler/IBaseCaseService.java | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 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 90587ed..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); + 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 size,Integer current, Integer state, Integer resource); + Page listIllegalBuilding(Integer current, Integer size, List<Integer> state, Integer resource); Boolean saveViolationCase(ViolationParam violationParam, Long id); @@ -63,13 +65,14 @@ void endCase(Long caseId, String result, String opinion); - Page<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer streetId, Integer categories, String startTime, String endTime, String site); + Page<BaseCase> selectPage(Page<BaseCase> setSize, String number, Integer communityId, Integer categories, String startTime, String endTime, String site, Integer state, Integer streetId, Integer time); + Page<QueryForViolationVO> selectViolation(QueryForViolationParam queryForViolationParam); List<QueryForViolationVO> selectViolationList(QueryForViolationParam queryForViolationParam); - Page<BaseCaseVO> selectVideoInspection(Integer current); + Page<BaseCaseVO> selectVideoInspection(Integer current, Integer pageSize, Long gradeId, Long videoId, String beginTime, String endTime, Integer type); Map<String, Object> selectCount(); @@ -90,4 +93,8 @@ List<DelayVO> selectDelayList(); Map<String, Object> statistics(); -} \ No newline at end of file + + IPage<WorkOrderVO> getWorkOrder(Integer current, Integer pageSize, String keyword); + + List<WorkOrderVO> getWorkOrderList(String keyword); +} -- Gitblit v1.8.0