From 1f45c25ea725445d7e78e8d5da6e72150f35f2eb Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期五, 20 十二月 2024 11:09:30 +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/impl/BaseCaseServiceImpl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
index 05b8a2e..863e7f6 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java
@@ -173,7 +173,7 @@
}
@Override
- public Page listViolationsPage(Integer current, Integer size, List<Integer> state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId) {
+ public Page listViolationsPage(Integer current, Integer size, List<Integer> state, Integer resource, String code, String categoryBig, String categorySmall, Integer street, String site, String startTime, String endTime, Integer violationsTypeId, Integer videoId) {
Integer type = 01;
Integer hours = 60;
Integer day = 24;
@@ -264,13 +264,15 @@
baseCase.setViolationsVO(violationsVO);
} else {
IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
- LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
- dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
- DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
- if (dictionary != null) {
- illegalBuilding.setCategoryText(dictionary.getName());
+ if(illegalBuilding!=null) {
+ LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
+ dict.eq(DataDictionary::getId, illegalBuilding.getCategoryId());
+ DataDictionary dictionary = dataDictionaryMapper.selectOne(dict);
+ if (dictionary != null) {
+ illegalBuilding.setCategoryText(dictionary.getName());
+ }
+ baseCase.setIllegalBuilding(illegalBuilding);
}
- baseCase.setIllegalBuilding(illegalBuilding);
}
//鑾峰彇璋冨害淇℃伅
Map mapD = new HashMap();
@@ -666,4 +668,23 @@
map.put("register", register);
return map;
}
+
+ @Override
+ public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword) {
+ if (pageIndex == null) {
+ pageIndex = 1;
+ }
+ if (pageSize == null) {
+ pageSize = 20;
+ }
+ IPage<WorkOrderVO> page = new Page<>(pageIndex, pageSize);
+ return baseCaseMapper.getWorkOrder(page, keyword);
+ }
+
+ @Override
+ public List<WorkOrderVO> getWorkOrderList(String keyword) {
+ IPage<WorkOrderVO> page = new Page<>(1, 5000);
+ IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword);
+ return page1.getRecords();
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0