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 9bf3bd6..2e47363 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -55,8 +55,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI public List riskTypeRate { get; set; } //当日工作票排名前三 public List jobTodayTop3 { get; set; } + //当日工作票统计数量 + public List jobTodayQty { get; set; } //隐患整改率 public HiddenRectify hiddenRectify { get; set; } + + //隐患统计数据 + public HiddenSummary hiddenSummary { get; set; } //各事项排名前三 public List taskTop3 { get; set; } //作业现场完成情况统计 @@ -95,6 +100,16 @@ namespace APT.SC.WebApi.Controllers.Api.BI public int qty { get; set; } } /// + /// 当日工作票统计数量 + /// + public class JobTodayQty + { + public int qty { get; set; } + public Guid workTypeId { get; set; } + + public string name { get; set; } + } + /// /// 隐患整改率 /// public class HiddenRectify @@ -107,6 +122,22 @@ namespace APT.SC.WebApi.Controllers.Api.BI public string rate { get; set; } } /// + /// 隐患统计数据 + /// + public class HiddenSummary + { + public int majorQty { get; set; } + + public int generalQty { get; set; } + public int unfinishQty { get; set; } + + public int monthMajorQty { get; set; } + + public int unfinishMonthMajorQty { get; set; } + public int monthGeneralQty { get; set; } + public int unfinishMonthGeneralQty { get; set; } + } + /// /// 各事项排名前三 /// public class TaskTopTemp @@ -268,45 +299,57 @@ namespace APT.SC.WebApi.Controllers.Api.BI riskData.Fill(tableRisk); result.Data.riskTypeRate = RiskTypeRateData(tableRisk); //当日工作票排名前三 - string sqlJob = "select * from vhome_jobtop3_today "; + //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.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup); + //当日工作票的统计数量 + string sqlJob = "select * from vhome_jobToday "; 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.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup); - //隐患整改率 - string sqlHidden = "select * from vhome_hidden_data_result "; + result.Data.jobTodayQty = JobTodayQtyData(tableJob); + //隐患统计数据 + string sqlHidden = "select * from vhome_hiddenSummary"; SqlCommand comHidden = new SqlCommand(sqlHidden, connection); SqlDataAdapter hiddenData = new SqlDataAdapter(comHidden); hiddenData.Fill(tableHidden); - result.Data.hiddenRectify = HiddenRectifyData(tableHidden); + result.Data.hiddenSummary = HiddenSummaryData(tableHidden); + //隐患整改率 + //string sqlHidden = "select * from vhome_hidden_data_result "; + //SqlCommand comHidden = new SqlCommand(sqlHidden, connection); + //SqlDataAdapter hiddenData = new SqlDataAdapter(comHidden); + //hiddenData.Fill(tableHidden); + //result.Data.hiddenRectify = HiddenRectifyData(tableHidden); //各事项排名前三 - string sqlTask = "select * from vhome_task_data_result "; - SqlCommand comTask = new SqlCommand(sqlTask, connection); - SqlDataAdapter taskData = new SqlDataAdapter(comTask); - taskData.Fill(tableTask); - result.Data.taskTop3 = TaskTopData(tableTask); + //string sqlTask = "select * from vhome_task_data_result "; + //SqlCommand comTask = new SqlCommand(sqlTask, connection); + //SqlDataAdapter taskData = new SqlDataAdapter(comTask); + //taskData.Fill(tableTask); + //result.Data.taskTop3 = TaskTopData(tableTask); //作业现场完成情况统计 - string sqlJobRate = "select * from vhome_jobrecord_data "; - SqlCommand comJobRate = new SqlCommand(sqlJobRate, connection); - SqlDataAdapter jobRateData = new SqlDataAdapter(comJobRate); - jobRateData.Fill(tableJobRate); - result.Data.jobFinishRate = jobFinishRateData(tableJobRate); + //string sqlJobRate = "select * from vhome_jobrecord_data "; + //SqlCommand comJobRate = new SqlCommand(sqlJobRate, connection); + //SqlDataAdapter jobRateData = new SqlDataAdapter(comJobRate); + //jobRateData.Fill(tableJobRate); + //result.Data.jobFinishRate = jobFinishRateData(tableJobRate); //各公司安全检查统计 - string sqlSafecCheck = "select * from vhome_check_total "; - SqlCommand comSafecCheck = new SqlCommand(sqlSafecCheck, connection); - SqlDataAdapter safecCheckData = new SqlDataAdapter(comSafecCheck); - safecCheckData.Fill(tableSafeCheck); - result.Data.safeCheckSum = safeCheckSumData(tableSafeCheck); + //string sqlSafecCheck = "select * from vhome_check_total "; + //SqlCommand comSafecCheck = new SqlCommand(sqlSafecCheck, connection); + //SqlDataAdapter safecCheckData = new SqlDataAdapter(comSafecCheck); + //safecCheckData.Fill(tableSafeCheck); + //result.Data.safeCheckSum = safeCheckSumData(tableSafeCheck); //各公司危险分类统计 - string sqlLink = "select * from vhome_operationLink_data "; - SqlCommand comLink = new SqlCommand(sqlLink, connection); - SqlDataAdapter linkData = new SqlDataAdapter(comLink); - linkData.Fill(tableLink); - result.Data.linkSum = linkSumData(tableLink); + //string sqlLink = "select * from vhome_operationLink_data "; + //SqlCommand comLink = new SqlCommand(sqlLink, connection); + //SqlDataAdapter linkData = new SqlDataAdapter(comLink); + //linkData.Fill(tableLink); + //result.Data.linkSum = linkSumData(tableLink); connection.Close(); } @@ -434,7 +477,28 @@ namespace APT.SC.WebApi.Controllers.Api.BI } return result; } - + /// + /// 当日工作票统计数量 + /// + /// 参数 + /// + public List JobTodayQtyData(DataTable Table) + { + List result = new List(); + if (Table != null && Table.Rows.Count > 0) + { + foreach (DataRow item in Table.Rows) + { + result.Add(new JobTodayQty() + { + qty = int.Parse(Table.Rows[0]["QTY"].ToString()) != 0 ? int.Parse(Table.Rows[0]["QTY"].ToString()) : 0, + workTypeId = Guid.Parse(Table.Rows[0]["WORK_PERMIT_TYPE_ID"].ToString()), + name = Table.Rows[0]["NAME"] != null ? Table.Rows[0]["NAME"].ToString() : null + }); + } + } + return result; + } /// /// 隐患整改率 /// @@ -452,7 +516,26 @@ namespace APT.SC.WebApi.Controllers.Api.BI } return result; } - + /// + /// 隐患统计数据 + /// + /// 参数 + /// + public HiddenSummary HiddenSummaryData(DataTable Table) + { + HiddenSummary result = new HiddenSummary(); + if (Table != null && Table.Rows.Count > 0) + { + result.majorQty = int.Parse(Table.Rows[0]["majorQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["majorQty"].ToString()) : 0; + result.generalQty = int.Parse(Table.Rows[0]["generalQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["generalQty"].ToString()) : 0; + result.unfinishQty = int.Parse(Table.Rows[0]["unfinishQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["unfinishQty"].ToString()) : 0; + result.monthMajorQty = int.Parse(Table.Rows[0]["monthMajorQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["monthMajorQty"].ToString()) : 0; + result.unfinishMonthMajorQty = int.Parse(Table.Rows[0]["unfinishMonthMajorQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["unfinishMonthMajorQty"].ToString()) : 0; + result.monthGeneralQty = int.Parse(Table.Rows[0]["monthGeneralQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["monthGeneralQty"].ToString()) : 0; + result.unfinishMonthGeneralQty = int.Parse(Table.Rows[0]["unfinishMonthGeneralQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["unfinishMonthGeneralQty"].ToString()) : 0; + } + return result; + } /// /// 各事项排名前三 ///