From bb7ce2c17f6541c8b21fb63b5aa4221433f2f974 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 22 一月 2026 16:37:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_screen

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 5a86225..bf4ca17 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
@@ -9,6 +9,8 @@
 import com.ruoyi.system.model.*;
 import com.ruoyi.system.query.StoryListQuery;
 import com.ruoyi.system.service.*;
+import com.ruoyi.system.vo.ClientDashboardQuery;
+import com.ruoyi.system.vo.ClientDashboardVO;
 import com.ruoyi.system.vo.ScreenUserVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -72,13 +74,18 @@
                     screenUserVo.setName(param.getName());
                     screenUserVo.setPermissionClient(param.getPermissionClient());
                     screenUserVo.setPermissionProject(param.getPermissionProject());
+                    screenUserVo.setCommentType(param.getCommentType());
                 }
             }else if(type==2){
                 Project project = projectService.getById(id);
                 if(project==null){
                     return R.fail("项目不存在");
                 }
-
+                Client client = clientService.getById(project.getClientId());
+                ClientParam param = clientParamService.getOne(new LambdaQueryWrapper<ClientParam>().eq(ClientParam::getClientId, client.getId()));
+                if(param!=null){
+                    screenUserVo.setCommentType(param.getCommentType());
+                }
                 screenUserVo.setName(project.getName());
                 screenUserVo.setPermissionProject(project.getPermission());
             }
@@ -125,6 +132,20 @@
         return R.ok(accidentBrief);
     }
 
+    /**
+     * 获取委托方大屏首页统计数据
+     *
+     * @param query 查询参数
+     * @return 统计数据
+     */
+    @PostMapping("/index")
+    @ApiOperation("获取委托方大屏首页统计数据")
+    public R<ClientDashboardVO> index(@RequestBody ClientDashboardQuery query) {
+        ClientDashboardVO dashboard = clientService.getClientDashboard(query);
+        return R.ok(dashboard);
+    }
+    
+
 
 
 

--
Gitblit v1.7.1