From c4c1c6cf89781eb06dc02b677a8954fdb2666c43 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 16 七月 2025 22:39:06 +0800
Subject: [PATCH] 添加时间筛选
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 2be50d9..91c8b33 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
@@ -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();
@@ -668,7 +670,7 @@
}
@Override
- public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword) {
+ public IPage<WorkOrderVO> getWorkOrder(Integer pageIndex, Integer pageSize, String keyword, String startTime, String endTime) {
if (pageIndex == null) {
pageIndex = 1;
}
@@ -676,13 +678,13 @@
pageSize = 20;
}
IPage<WorkOrderVO> page = new Page<>(pageIndex, pageSize);
- return baseCaseMapper.getWorkOrder(page, keyword);
+ return baseCaseMapper.getWorkOrder(page, keyword, startTime, endTime);
}
@Override
- public List<WorkOrderVO> getWorkOrderList(String keyword) {
+ public List<WorkOrderVO> getWorkOrderList(String keyword, String startTime, String endTime) {
IPage<WorkOrderVO> page = new Page<>(1, 5000);
- IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword);
+ IPage<WorkOrderVO> page1 = baseCaseMapper.getWorkOrder(page, keyword, startTime, endTime);
return page1.getRecords();
}
}
\ No newline at end of file
--
Gitblit v1.8.0