From 65196eb40f8ee27a5a9c0af64b8088685b0caa93 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 二月 2026 18:32:16 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
index 05489a3..de2bb7c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
@@ -77,7 +77,12 @@
screenUserVo.setPermissionProject(param.getPermissionProject());
screenUserVo.setCommentType(param.getCommentType());
screenUserVo.setSafetyId(param.getSafetyId());
+ String name = clientParamService.getTemplateName(param.getSafetyId());
+ screenUserVo.setSafetyName(name);
+
screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setDeviceTemplateName(clientParamService.getTemplateName(param.getDeviceTemplateId()));
+
screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
@@ -91,7 +96,11 @@
if(param!=null){
screenUserVo.setCommentType(param.getCommentType());
screenUserVo.setSafetyId(param.getSafetyId());
+ String name = clientParamService.getTemplateName(param.getSafetyId());
+ screenUserVo.setSafetyName(name);
screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ String name1 = clientParamService.getTemplateName(param.getDeviceTemplateId());
+ screenUserVo.setDeviceTemplateName(name1);
screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
@@ -114,9 +123,17 @@
List<AccidentClassification> list = accidentClassificationService.list(new LambdaQueryWrapper<AccidentClassification>().eq(AccidentClassification::getDeleted, false));
LambdaQueryWrapper<AccidentBrief> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(AccidentBrief::getState,1);
+ wrapper.eq(AccidentBrief::getDeleted,false);
if(query.getCity()!=null && !query.getCity().isEmpty()){
wrapper.eq(AccidentBrief::getCity, query.getCity());
}
+ if(query.getProvince()!=null && !query.getProvince().isEmpty()){
+ wrapper.eq(AccidentBrief::getProvince, query.getProvince());
+ }
+ if(query.getArea()!=null && !query.getArea().isEmpty()){
+ wrapper.eq(AccidentBrief::getArea, query.getArea());
+ }
+
if(query.getClassifyId()!=null){
wrapper.eq(AccidentBrief::getClassifyId, query.getClassifyId());
}
--
Gitblit v1.7.1