From f9c566418b04bd58fd0274db344bd8aa13e7a8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?=
 <10755671+mei-rong-he@user.noreply.gitee.com>
Date: Mon, 19 Jan 2026 16:36:04 +0800
Subject: [PATCH] 1

---
 .../Api/BIController/BIKanBanController.cs      | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
index f6013bf..2894be5 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
@@ -139,10 +139,11 @@ namespace APT.SC.WebApi.Controllers.Api.BI
         /// <param name="filter">分页过滤实体</param>
         /// <returns></returns>
         [HttpPost, Route("ReturnAllData")]
-        public ReturnAll ReturnAllData([FromBody] KeywordFilter filter)
+        public JsonActionResult<ReturnAll> ReturnAllData([FromBody] KeywordFilter filter)
         {
             string connhead = ConfigurationManager.ConnectionStrings["head"];
-            ReturnAll result = new ReturnAll();
+            JsonActionResult<ReturnAll> result = new JsonActionResult<ReturnAll>();
+            result.Data = new ReturnAll();
             DataTable tableRisk = new DataTable();
             DataTable tableJob = new DataTable();
             DataTable tableJobGroup = new DataTable();
@@ -160,7 +161,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                     SqlCommand comRisk = new SqlCommand(sqlRisk, connection);
                     SqlDataAdapter riskData = new SqlDataAdapter(comRisk);
                     riskData.Fill(tableRisk);
-                    result.riskTypeRate = RiskTypeRateData(connhead, tableRisk);
+                    result.Data.riskTypeRate = RiskTypeRateData(connhead, tableRisk);
                     //当日工作票排名前三
                     string sqlJob = "select * from vhome_jobtop3_today ";
                     SqlCommand comJob = new SqlCommand(sqlJob, connection);
@@ -170,31 +171,31 @@ namespace APT.SC.WebApi.Controllers.Api.BI
                     SqlCommand comJobGroup = new SqlCommand(sqlJobGroup, connection);
                     SqlDataAdapter jobGroupData = new SqlDataAdapter(comJobGroup);
                     jobGroupData.Fill(tableJobGroup);
-                    result.jobTodayTop3 = JobTodayTopData(connhead, filter.OrgId.Value, tableJob,tableJobGroup);
+                    result.Data.jobTodayTop3 = JobTodayTopData(connhead, filter.OrgId.Value, tableJob,tableJobGroup);
                     //隐患整改率
                     string sqlHidden = "select * from vhome_hidden_data_result ";
                     SqlCommand comHidden = new SqlCommand(sqlHidden, connection);
                     SqlDataAdapter hiddenData = new SqlDataAdapter(comHidden);
                     hiddenData.Fill(tableHidden);
-                    result.hiddenRectify = HiddenRectifyData(connhead, tableHidden);
+                    result.Data.hiddenRectify = HiddenRectifyData(connhead, tableHidden);
                     //各事项排名前三
                     string sqlTask = "select * from vhome_task_data_result ";
                     SqlCommand comTask = new SqlCommand(sqlTask, connection);
                     SqlDataAdapter taskData = new SqlDataAdapter(comTask);
                     taskData.Fill(tableTask);
-                    result.taskTop3 = TaskTopData(connhead, tableTask);
+                    result.Data.taskTop3 = TaskTopData(connhead, tableTask);
                     //作业现场完成情况统计
                     string sqlJobRate = "select * from vhome_jobrecord_data ";
                     SqlCommand comJobRate = new SqlCommand(sqlJobRate, connection);
                     SqlDataAdapter jobRateData = new SqlDataAdapter(comJobRate);
                     jobRateData.Fill(tableJobRate);
-                    result.jobFinishRate = jobFinishRateData(connhead, tableJobRate);
+                    result.Data.jobFinishRate = jobFinishRateData(connhead, tableJobRate);
                     //各公司安全检查统计
                     string sqlSafecCheck= "select * from vhome_check_total ";
                     SqlCommand comSafecCheck = new SqlCommand(sqlSafecCheck, connection);
                     SqlDataAdapter safecCheckData = new SqlDataAdapter(comSafecCheck);
                     safecCheckData.Fill(tableSafeCheck);
-                    result.safeCheckSum = safeCheckSumData(connhead, tableSafeCheck);
+                    result.Data.safeCheckSum = safeCheckSumData(connhead, tableSafeCheck);
                     connection.Close();
                 }
                 catch (Exception ex)