From 0ed4841adc34ad7ec4ed855fe5a033db54b5202a 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 14:43:22 +0800
Subject: [PATCH] 1
---
.../Api/BIController/BIKanBanController.cs | 441 +++++++-----------
1 file changed, 158 insertions(+), 283 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 c19c47f..f6013bf 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
@@ -143,58 +143,59 @@ namespace APT.SC.WebApi.Controllers.Api.BI
{
string connhead = ConfigurationManager.ConnectionStrings["head"];
ReturnAll result = new ReturnAll();
- //风险等级占比
- result.riskTypeRate = RiskTypeRateData(connhead);
- //当日工作票排名前三
- result.jobTodayTop3 = JobTodayTopData(connhead,filter.OrgId.Value);
- //隐患整改率
- result.hiddenRectify = HiddenRectifyData(connhead);
- //各事项排名前三
- result.taskTop3 = TaskTopData(connhead);
- //作业现场完成情况统计
- result.jobFinishRate = jobFinishRateData(connhead);
- //各公司安全检查统计
- result.safeCheckSum = safeCheckSumData(connhead);
-
- return result;
- }
- ///
- /// 风险等级占比
- ///
- /// 分页过滤实体
- public List RiskTypeRateData(string connhead)
- {
- List result = new List();
- DataTable Table = new DataTable();
+ DataTable tableRisk = new DataTable();
+ DataTable tableJob = new DataTable();
+ DataTable tableJobGroup = new DataTable();
+ DataTable tableHidden = new DataTable();
+ DataTable tableTask = new DataTable();
+ DataTable tableJobRate = new DataTable();
+ DataTable tableSafeCheck = new DataTable();
using (SqlConnection connection = new SqlConnection(connhead))
{
try
{
connection.Open();
- string sql = "select * from vhome_risk_type_data ";
- //if (dt != DateTime.Now.Date)
- //{
- // sql += " and crdate>='" + dt + "'";
- //}
- //sql += " order by crdate desc";
- using (SqlCommand Com = new SqlCommand(sql, connection))
- {
- SqlDataAdapter Data = new SqlDataAdapter(Com);
- Data.Fill(Table);
- }
+ //风险等级占比
+ string sqlRisk = "select * from vhome_risk_type_data ";
+ SqlCommand comRisk = new SqlCommand(sqlRisk, connection);
+ SqlDataAdapter riskData = new SqlDataAdapter(comRisk);
+ riskData.Fill(tableRisk);
+ result.riskTypeRate = RiskTypeRateData(connhead, tableRisk);
+ //当日工作票排名前三
+ string sqlJob = "select * from vhome_jobtop3_today ";
+ SqlCommand comJob = new SqlCommand(sqlJob, connection);
+ SqlDataAdapter jobData = new SqlDataAdapter(comJob);
+ jobData.Fill(tableJob);
+ string sqlJobGroup = "select* from vhome_jobdata_today_group";
+ SqlCommand comJobGroup = new SqlCommand(sqlJobGroup, connection);
+ SqlDataAdapter jobGroupData = new SqlDataAdapter(comJobGroup);
+ jobGroupData.Fill(tableJobGroup);
+ result.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);
+ //各事项排名前三
+ 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);
+ //作业现场完成情况统计
+ 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);
+ //各公司安全检查统计
+ 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);
connection.Close();
- if (Table != null && Table.Rows.Count > 0)
- {
- foreach (DataRow item in Table.Rows)
- {
- result.Add(new RiskTypeRate()
- {
- riskType = item["风险类别"] != null ? item["风险类别"].ToString() : null,
- count = int.Parse(item["数量"].ToString()) != 0 ? int.Parse(item["数量"].ToString()) : 0,
- rate = item["占比"] != null ? item["占比"].ToString() : "0"
- });
- }
- }
}
catch (Exception ex)
{
@@ -206,96 +207,78 @@ namespace APT.SC.WebApi.Controllers.Api.BI
}
return result;
}
+ ///
+ /// 风险等级占比
+ ///
+ /// 分页过滤实体
+ public List RiskTypeRateData(string connhead, DataTable Table)
+ {
+ List result = new List();
+ if (Table != null && Table.Rows.Count > 0)
+ {
+ foreach (DataRow item in Table.Rows)
+ {
+ result.Add(new RiskTypeRate()
+ {
+ riskType = item["风险类别"] != null ? item["风险类别"].ToString() : null,
+ count = int.Parse(item["数量"].ToString()) != 0 ? int.Parse(item["数量"].ToString()) : 0,
+ rate = item["占比"] != null ? item["占比"].ToString() : "0"
+ });
+ }
+ }
+ return result;
+ }
///
/// 当日工作票排名前三
///
/// 参数
///
- public List JobTodayTopData(string connhead,Guid orgId)
+ public List JobTodayTopData(string connhead,Guid orgId, DataTable Table, DataTable Table2)
{
List result = new List();
var details = new List();
- DataTable Table = new DataTable();
- DataTable Table2 = new DataTable();
- using (SqlConnection connection = new SqlConnection(connhead))
+ if (Table != null && Table.Rows.Count > 0)
{
- try
+ foreach (DataRow item in Table.Rows)
{
- connection.Open();
- string sql = "select * from vhome_jobtop3_today ";
- //if (dt != DateTime.Now.Date)
- //{
- // sql += " and crdate>='" + dt + "'";
- //}
- //sql += " order by crdate desc";
- using (SqlCommand Com = new SqlCommand(sql, connection))
+ var JobTodayTop3 = new JobTodayTop3();
+ JobTodayTop3.totalQty = int.Parse(item["今日总数"].ToString()) != 0 ? int.Parse(item["今日总数"].ToString()) : 0;
+ JobTodayTop3.num = int.Parse(item["排名"].ToString()) != 0 ? int.Parse(item["排名"].ToString()) : 0;
+ JobTodayTop3.company = item["公司名称"] != null ? item["公司名称"].ToString() : "";
+ result.Add(JobTodayTop3);
+ }
+ }
+ if (Table2 != null && Table2.Rows.Count > 0)
+ {
+ foreach (DataRow item2 in Table2.Rows)
+ {
+ var JobTodayDetail = new JobTodayDetail();
+ JobTodayDetail.qty = int.Parse(item2["cnt"].ToString()) != 0 ? int.Parse(item2["cnt"].ToString()) : 0;
+ JobTodayDetail.jobName = item2["stepid"] != null ? item2["stepid"].ToString() : null;
+ JobTodayDetail.company = item2["db_name"] != null ? item2["db_name"].ToString() : null;
+ details.Add(JobTodayDetail);
+ }
+ }
+ if (result != null && result.Any())
+ {
+ var steps = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(orgId));
+ foreach (var da in result)
+ {
+ var temps = details.Where(t => t.company == da.company).ToList();
+ if (temps.Any())
{
- SqlDataAdapter Data = new SqlDataAdapter(Com);
- Data.Fill(Table);
- }
- string sql2 = "select * from vhome_jobdata_today_group ";
- //if (dt != DateTime.Now.Date)
- //{
- // sql += " and crdate>='" + dt + "'";
- //}
- //sql += " order by crdate desc";
- using (SqlCommand Com = new SqlCommand(sql2, connection))
- {
- SqlDataAdapter Data = new SqlDataAdapter(Com);
- Data.Fill(Table2);
- }
- connection.Close();
- if (Table != null && Table.Rows.Count > 0)
- {
- foreach (DataRow item in Table.Rows)
- {
- var JobTodayTop3 = new JobTodayTop3();
- JobTodayTop3.totalQty = int.Parse(item["今日总数"].ToString()) != 0 ? int.Parse(item["今日总数"].ToString()) : 0;
- JobTodayTop3.num = int.Parse(item["排名"].ToString()) != 0 ? int.Parse(item["排名"].ToString()) : 0;
- JobTodayTop3.company = item["公司名称"] != null ? item["公司名称"].ToString() : "";
- result.Add(JobTodayTop3);
- }
- }
- if (Table2 != null && Table2.Rows.Count > 0)
- {
- foreach (DataRow item2 in Table2.Rows)
+ var detailTemps = new List();
+ foreach (var de in temps)
{
var JobTodayDetail = new JobTodayDetail();
- JobTodayDetail.qty = int.Parse(item2["cnt"].ToString()) != 0 ? int.Parse(item2["cnt"].ToString()) : 0;
- JobTodayDetail.jobName = item2["stepid"] != null ? item2["stepid"].ToString() : null;
- JobTodayDetail.company = item2["db_name"] != null ? item2["db_name"].ToString() : null;
- details.Add(JobTodayDetail);
+ JobTodayDetail.qty = de.qty;
+ JobTodayDetail.jobName = steps.FirstOrDefault(t => t.ID == Guid.Parse(de.jobName))?.NAME;
+ JobTodayDetail.company = de.company;
+ detailTemps.Add(JobTodayDetail);
}
+ da.details = detailTemps;
}
- if (result != null && result.Any())
- {
- var steps = this.GetEntities(t => !t.IS_DELETED, new BaseFilter(orgId));
- foreach (var da in result)
- {
- var temps = details.Where(t => t.company == da.company).ToList();
- if (temps.Any())
- {
- var detailTemps = new List();
- foreach (var de in temps)
- {
- var JobTodayDetail = new JobTodayDetail();
- JobTodayDetail.qty = de.qty;
- JobTodayDetail.jobName = steps.FirstOrDefault(t=>t.ID == Guid.Parse(de.jobName))?.NAME;
- JobTodayDetail.company = de.company;
- detailTemps.Add(JobTodayDetail);
- }
- da.details = detailTemps;
- }
- }
- }
- }
- catch (Exception ex)
- {
- if (!string.IsNullOrEmpty(ex.StackTrace))
- throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
- else
- throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
}
}
return result;
@@ -306,42 +289,15 @@ namespace APT.SC.WebApi.Controllers.Api.BI
///
/// 参数
///
- public HiddenRectify HiddenRectifyData(string connhead)
+ public HiddenRectify HiddenRectifyData(string connhead, DataTable Table)
{
HiddenRectify result = new HiddenRectify();
- DataTable Table = new DataTable();
- using (SqlConnection connection = new SqlConnection(connhead))
+ if (Table != null && Table.Rows.Count > 0)
{
- try
- {
- connection.Open();
- string sql = "select * from vhome_hidden_data_result ";
- //if (dt != DateTime.Now.Date)
- //{
- // sql += " and crdate>='" + dt + "'";
- //}
- //sql += " order by crdate desc";
- using (SqlCommand Com = new SqlCommand(sql, connection))
- {
- SqlDataAdapter Data = new SqlDataAdapter(Com);
- Data.Fill(Table);
- }
- connection.Close();
- if (Table != null && Table.Rows.Count > 0)
- {
- result.qty = int.Parse(Table.Rows[0]["隐患数"].ToString()) != 0 ? int.Parse(Table.Rows[0]["隐患数"].ToString()) : 0;
- result.ontimeQty = int.Parse(Table.Rows[0]["按期整改数"].ToString()) != 0 ? int.Parse(Table.Rows[0]["按期整改数"].ToString()) : 0;
- result.delayQty = int.Parse(Table.Rows[0]["延期整改数"].ToString()) != 0 ? int.Parse(Table.Rows[0]["延期整改数"].ToString()) : 0;
- result.rate = Table.Rows[0]["整改率"] != null ? Table.Rows[0]["整改率"].ToString() : null;
- }
- }
- catch (Exception ex)
- {
- if (!string.IsNullOrEmpty(ex.StackTrace))
- throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
- else
- throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
- }
+ result.qty = int.Parse(Table.Rows[0]["隐患数"].ToString()) != 0 ? int.Parse(Table.Rows[0]["隐患数"].ToString()) : 0;
+ result.ontimeQty = int.Parse(Table.Rows[0]["按期整改数"].ToString()) != 0 ? int.Parse(Table.Rows[0]["按期整改数"].ToString()) : 0;
+ result.delayQty = int.Parse(Table.Rows[0]["延期整改数"].ToString()) != 0 ? int.Parse(Table.Rows[0]["延期整改数"].ToString()) : 0;
+ result.rate = Table.Rows[0]["整改率"] != null ? Table.Rows[0]["整改率"].ToString() : null;
}
return result;
}
@@ -351,71 +307,44 @@ namespace APT.SC.WebApi.Controllers.Api.BI
///
/// 参数
///
- public List TaskTopData(string connhead)
+ public List TaskTopData(string connhead, DataTable Table)
{
List result = new List();
var dataTemps = new List();
- DataTable Table = new DataTable();
- using (SqlConnection connection = new SqlConnection(connhead))
+ if (Table != null && Table.Rows.Count > 0)
{
- try
+ foreach (DataRow item in Table.Rows)
{
- connection.Open();
- string sql = "select * from vhome_task_data_result ";
- //if (dt != DateTime.Now.Date)
- //{
- // sql += " and crdate>='" + dt + "'";
- //}
- //sql += " order by crdate desc";
- using (SqlCommand Com = new SqlCommand(sql, connection))
- {
- SqlDataAdapter Data = new SqlDataAdapter(Com);
- Data.Fill(Table);
- }
- connection.Close();
- if (Table != null && Table.Rows.Count > 0)
- {
- foreach (DataRow item in Table.Rows)
- {
- var JobTodayTop3 = new TaskTopTemp();
- JobTodayTop3.totalQty = int.Parse(item["待办总数"].ToString()) != 0 ? int.Parse(item["待办总数"].ToString()) : 0;
- JobTodayTop3.qty = int.Parse(item["数量"].ToString()) != 0 ? int.Parse(item["数量"].ToString()) : 0;
- JobTodayTop3.company = item["公司名称"] != null ? item["公司名称"].ToString() : "";
- JobTodayTop3.type = item["类型"] != null ? item["类型"].ToString() : "";
- dataTemps.Add(JobTodayTop3);
- }
- }
- if (dataTemps != null && dataTemps.Any())
- {
- var dataGroup = dataTemps.GroupBy(t => new { t.company,t.totalQty }).ToList();
- foreach (var da in dataGroup)
- {
- var TaskTop3 = new TaskTop3();
- TaskTop3.company = da.Key.company;
- TaskTop3.totalQty = da.Key.totalQty;
- var temps = dataTemps.Where(t => t.company == da.Key.company).ToList();
- if (temps.Any())
- {
- var detailTemps = new List();
- foreach (var de in temps)
- {
- var JobTodayDetail = new TaskTopDetail();
- JobTodayDetail.qty = de.qty;
- JobTodayDetail.name = de.type;
- detailTemps.Add(JobTodayDetail);
- }
- TaskTop3.details = detailTemps;
- }
- result.Add(TaskTop3);
- }
- }
+ var JobTodayTop3 = new TaskTopTemp();
+ JobTodayTop3.totalQty = int.Parse(item["待办总数"].ToString()) != 0 ? int.Parse(item["待办总数"].ToString()) : 0;
+ JobTodayTop3.qty = int.Parse(item["数量"].ToString()) != 0 ? int.Parse(item["数量"].ToString()) : 0;
+ JobTodayTop3.company = item["公司名称"] != null ? item["公司名称"].ToString() : "";
+ JobTodayTop3.type = item["类型"] != null ? item["类型"].ToString() : "";
+ dataTemps.Add(JobTodayTop3);
}
- catch (Exception ex)
- {
- if (!string.IsNullOrEmpty(ex.StackTrace))
- throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
- else
- throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
+ }
+ if (dataTemps != null && dataTemps.Any())
+ {
+ var dataGroup = dataTemps.GroupBy(t => new { t.company, t.totalQty }).ToList();
+ foreach (var da in dataGroup)
+ {
+ var TaskTop3 = new TaskTop3();
+ TaskTop3.company = da.Key.company;
+ TaskTop3.totalQty = da.Key.totalQty;
+ var temps = dataTemps.Where(t => t.company == da.Key.company).ToList();
+ if (temps.Any())
+ {
+ var detailTemps = new List();
+ foreach (var de in temps)
+ {
+ var JobTodayDetail = new TaskTopDetail();
+ JobTodayDetail.qty = de.qty;
+ JobTodayDetail.name = de.type;
+ detailTemps.Add(JobTodayDetail);
+ }
+ TaskTop3.details = detailTemps;
+ }
+ result.Add(TaskTop3);
}
}
return result;
@@ -427,47 +356,20 @@ namespace APT.SC.WebApi.Controllers.Api.BI
///
/// 参数
///
- public List jobFinishRateData(string connhead)
+ public List jobFinishRateData(string connhead, DataTable Table)
{
List result = new List();
- DataTable Table = new DataTable();
- using (SqlConnection connection = new SqlConnection(connhead))
+ if (Table != null && Table.Rows.Count > 0)
{
- try
+ foreach (DataRow item in Table.Rows)
{
- connection.Open();
- string sql = "select * from vhome_jobrecord_data ";
- //if (dt != DateTime.Now.Date)
- //{
- // sql += " and crdate>='" + dt + "'";
- //}
- //sql += " order by crdate desc";
- using (SqlCommand Com = new SqlCommand(sql, connection))
+ result.Add(new JobFinishRate()
{
- SqlDataAdapter Data = new SqlDataAdapter(Com);
- Data.Fill(Table);
- }
- connection.Close();
- if (Table != null && Table.Rows.Count > 0)
- {
- foreach (DataRow item in Table.Rows)
- {
- result.Add(new JobFinishRate()
- {
- name = item["表单名称"] != null ? item["表单名称"].ToString() : null,
- qty = int.Parse(item["总数"].ToString()) != 0 ? int.Parse(item["总数"].ToString()) : 0,
- finishQty = int.Parse(item["完成数"].ToString()) != 0 ? int.Parse(item["完成数"].ToString()) : 0,
- rate = item["完成率"] != null ? item["完成率"].ToString() : null,
- });
- }
- }
- }
- catch (Exception ex)
- {
- if (!string.IsNullOrEmpty(ex.StackTrace))
- throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
- else
- throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
+ name = item["表单名称"] != null ? item["表单名称"].ToString() : null,
+ qty = int.Parse(item["总数"].ToString()) != 0 ? int.Parse(item["总数"].ToString()) : 0,
+ finishQty = int.Parse(item["完成数"].ToString()) != 0 ? int.Parse(item["完成数"].ToString()) : 0,
+ rate = item["完成率"] != null ? item["完成率"].ToString() : null,
+ });
}
}
return result;
@@ -479,46 +381,19 @@ namespace APT.SC.WebApi.Controllers.Api.BI
///
/// 参数
///
- public List safeCheckSumData(string connhead)
+ public List safeCheckSumData(string connhead, DataTable Table)
{
List result = new List();
- DataTable Table = new DataTable();
- using (SqlConnection connection = new SqlConnection(connhead))
+ if (Table != null && Table.Rows.Count > 0)
{
- try
+ foreach (DataRow item in Table.Rows)
{
- connection.Open();
- string sql = "select * from vhome_check_total ";
- //if (dt != DateTime.Now.Date)
- //{
- // sql += " and crdate>='" + dt + "'";
- //}
- //sql += " order by crdate desc";
- using (SqlCommand Com = new SqlCommand(sql, connection))
+ result.Add(new SafeCheckSum()
{
- SqlDataAdapter Data = new SqlDataAdapter(Com);
- Data.Fill(Table);
- }
- connection.Close();
- if (Table != null && Table.Rows.Count > 0)
- {
- foreach (DataRow item in Table.Rows)
- {
- result.Add(new SafeCheckSum()
- {
- company = item["公司名称"] != null ? item["公司名称"].ToString() : null,
- qty = int.Parse(item["数量"].ToString()) != 0 ? int.Parse(item["数量"].ToString()) : 0,
- num = int.Parse(item["排名"].ToString()) != 0 ? int.Parse(item["排名"].ToString()) : 0,
- });
- }
- }
- }
- catch (Exception ex)
- {
- if (!string.IsNullOrEmpty(ex.StackTrace))
- throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
- else
- throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
+ company = item["公司名称"] != null ? item["公司名称"].ToString() : null,
+ qty = int.Parse(item["数量"].ToString()) != 0 ? int.Parse(item["数量"].ToString()) : 0,
+ num = int.Parse(item["排名"].ToString()) != 0 ? int.Parse(item["排名"].ToString()) : 0,
+ });
}
}
return result;