From 8ab97da36f98d75daed63cb795f037a13c530024 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 29 一月 2026 17:40:30 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 1ada1c9..5ad5ee3 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
@@ -76,6 +76,10 @@
screenUserVo.setPermissionClient(param.getPermissionClient());
screenUserVo.setPermissionProject(param.getPermissionProject());
screenUserVo.setCommentType(param.getCommentType());
+ screenUserVo.setSafetyId(param.getSafetyId());
+ screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
}else if(type==2){
Project project = projectService.getById(id);
@@ -86,6 +90,10 @@
ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
if(param!=null){
screenUserVo.setCommentType(param.getCommentType());
+ screenUserVo.setSafetyId(param.getSafetyId());
+ screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
+ screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
screenUserVo.setName(project.getName());
screenUserVo.setPermissionProject(project.getPermission());
@@ -106,9 +114,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());
}
@@ -180,7 +196,7 @@
* @return 统计数据
*/
@PostMapping("/index")
- @ApiOperation("获取委托方大屏首页统计数据")
+ @ApiOperation(value = "获取委托方大屏首页统计数据",tags = {"委托方端"})
public R<ClientDashboardVO> index(@RequestBody ClientDashboardQuery query) {
ClientDashboardVO dashboard = clientService.getClientDashboard(query);
return R.ok(dashboard);
--
Gitblit v1.7.1