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 38befdf..d54e859 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -817,14 +817,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI { string strConn = OPTenantDBConnService.GetConnByORGID(filter.OrgId.Value); DataSet ds = DBHelper.ExecProcedure(strConn, "proc_HomeSubHiddenManage", dic, HttpContext.Request.Path); - double percent = 0; if (ds != null && ds.Tables != null && ds.Tables.Count > 0) { - List listHiddenOrder = new List(); + List hiddenRanking = new List(); int NUM = 1; foreach (DataRow item in ds.Tables[0].Rows) { - listHiddenOrder.Add(new + hiddenRanking.Add(new { NUM = NUM, hiddenName = item[0], @@ -832,28 +831,28 @@ namespace APT.SC.WebApi.Controllers.Api.BI }); NUM++; } - listResult.listHiddenOrder = listHiddenOrder; + listResult.hiddenRanking = hiddenRanking; if (string.IsNullOrEmpty(ORGID)) { //全部搜索 3张表 - List listHidden = new List(); + List hiddenList = new List(); DataTable dt = ds.Tables[1]; foreach (DataRow item in dt.Rows) { - listHidden.Add(new + hiddenList.Add(new { companyName = item["companyName"], generalCount = item["generalCount"], majorCount = item["majorCount"], }); } - listResult.listHidden = listHidden; + listResult.hiddenList = hiddenList; - List listHiddenDoneMonth = new List(); + List hiddenRectifyList = new List(); dt = ds.Tables[2]; foreach (DataRow item in dt.Rows) { - listHiddenDoneMonth.Add(new + hiddenRectifyList.Add(new { companyName = item["companyName"], generalCount = item["generalCount"], @@ -862,7 +861,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI generalCountNo = item["generalCountNo"], }); } - listResult.listHiddenDoneMonth = listHiddenDoneMonth; + listResult.hiddenRectifyList = hiddenRectifyList; } } } @@ -880,14 +879,14 @@ namespace APT.SC.WebApi.Controllers.Api.BI /// /// 隐患数量统计 /// - public List listHidden { get; set; } + public List hiddenList { get; set; } /// /// 月度隐患处理统计 /// - public List listHiddenDoneMonth { get; set; } + public List hiddenRectifyList { get; set; } /// /// 隐患排序 /// - public List listHiddenOrder { get; set; } + public List hiddenRanking { get; set; } } }