From 05af069d9d1eb900a3e9202a5e03d4b8b79e1640 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 08 十二月 2022 13:42:31 +0800
Subject: [PATCH] fix: 案卷查询参数
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/BaseCaseServiceImpl.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 d52648f..fc96219 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
@@ -15,6 +15,7 @@
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.dto.caseHandler.QueryForViolationParam;
import com.ycl.dto.casePool.IllegalBuildingParam;
+import com.ycl.dto.casePool.VideoInspectParam;
import com.ycl.dto.casePool.ViolationParam;
import com.ycl.entity.caseHandler.*;
import com.ycl.entity.dict.DataDictionary;
@@ -31,6 +32,8 @@
import com.ycl.service.caseHandler.IViolationsService;
import com.ycl.service.video.IVideoAlarmReportService;
import com.ycl.vo.casePool.*;
+import com.ycl.vo.cockpit.enforcementEvents.EnforcementEventsVO;
+import com.ycl.vo.cockpit.enforcementEvents.EventVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -248,8 +251,8 @@
if (baseCase.getCategory() == 1) {
Map mapV = new HashMap();
mapV.put("id", baseCase.getId());
- Violations violations = violationsMapper.selectCondMap(mapV);
- baseCase.setViolations(violations);
+ ViolationsVO violationsVO = violationsMapper.selectCondMap(mapV);
+ baseCase.setViolationsVO(violationsVO);
} else {
IllegalBuilding illegalBuilding = illegalBuildingMapper.selectById(baseCase.getId());
LambdaQueryWrapper<DataDictionary> dict = new LambdaQueryWrapper<>();
@@ -414,13 +417,17 @@
public Map<String, Object> selectCount() {
HashMap<String, Object> map = new HashMap<>();
Long review = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 1));
+ Long register = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().in(BaseCase::getState, 2,6));
+ Long study = baseCaseMapper.selectCount(new LambdaQueryWrapper<BaseCase>().eq(BaseCase::getState, 3));
map.put("review", review);
+ map.put("register",register);
+ map.put("study",study);
return map;
}
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean updateCase(ViolationParam violationParam) {
+ public Boolean updateCase(VideoInspectParam violationParam) {
BaseCase baseCase = new BaseCase();
BeanUtils.copyProperties(violationParam, baseCase);
baseCase.setId(violationParam.getBaseId());
@@ -442,4 +449,29 @@
}
return violationsMapper.insert(violations) == 1 ? true : false;
}
+
+ @Override
+ public Integer dayCount() {
+ return baseCaseMapper.dayCount();
+ }
+
+ @Override
+ public Integer weekCount() {
+ return baseCaseMapper.weekCount();
+ }
+
+ @Override
+ public Integer dispatchCount() {
+ return baseCaseMapper.dispatchCount();
+ }
+
+ @Override
+ public Integer alCount() {
+ return baseCaseMapper.alCount();
+ }
+
+ @Override
+ public List<EventVO> selectEventList(String beginTime, String endTime) {
+ return baseCaseMapper.selectEventList(beginTime,endTime);
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0