From 56c35a04a31648cb11e492624470723e1276d005 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 6 May 2026 10:00:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9C=8B=E6=9D=BF=20SEtrInfo=20=E5=8F=8A?= =?UTF-8?q?=E6=97=B6=E6=B2=A1=E6=95=B0=E6=8D=AE=20=E4=B9=9F=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=AF=B9=E5=BA=94=E7=9A=84=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit HiddenManage 返回所有的公司隐患排序结果 --- .../Api/BIController/BIHeadSEController.cs | 6 +- .../Api/BIController/BIKanBanController.cs | 102 +++++++++--------- 2 files changed, 55 insertions(+), 53 deletions(-) diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs index 16cba84..6d39a99 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIHeadSEController.cs @@ -182,9 +182,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI } DataTable dtAnn = dsHead.Tables[1]; + result.listAnnourcement = new List(); if (dtAnn != null && dtAnn.Rows.Count > 0) { - result.listAnnourcement = new List(); foreach (DataRow item in dtAnn.Rows) { try @@ -203,9 +203,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI DataTable dtVMSet = dsHead.Tables[3]; + result.playSet = new T_PF_BIPLAY_SET(); if (dtVMSet != null && dtVMSet.Rows.Count > 0) { - result.playSet = new T_PF_BIPLAY_SET(); string colVal = string.Empty; try { @@ -235,9 +235,9 @@ namespace APT.SC.WebApi.Controllers.Api.BI //播放信息 DataTable dtVM = dsHead.Tables[2]; + result.listVideoImg = new List(); if (dtVM != null && dtVM.Rows.Count > 0) { - result.listVideoImg = new List(); FILETYPEEnum TYPE = (FILETYPEEnum)int.Parse(dtVM.Rows[0][0].ToString()); string TITLE = dtVM.Rows[0][1].ToString(); 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 85ef04f..469f89c 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -767,7 +767,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI //Parameter3 传入 ORGID 如果有 Dictionary dic = new Dictionary(); DateTime dtSecrch = DateTime.Now; - string ORGID = ""; + //string ORGID = ""; if (!string.IsNullOrEmpty(filter.Parameter2)) { try @@ -779,21 +779,21 @@ namespace APT.SC.WebApi.Controllers.Api.BI dtSecrch = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-01 00:00:00")); } } - if (!string.IsNullOrEmpty(filter.Parameter3)) - { - try - { - ORGID = (new Guid(filter.Parameter3)).ToString(); - } - catch - { - ORGID = ""; - } - } + //if (!string.IsNullOrEmpty(filter.Parameter3)) + //{ + // try + // { + // ORGID = (new Guid(filter.Parameter3)).ToString(); + // } + // catch + // { + // ORGID = ""; + // } + //} dic.Add("@dtMonthMin", dtSecrch.ToString("yyyy-MM-dd 00:00:00")); dic.Add("@dtMonthMax", dtSecrch.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd HH:mm:ss")); - dic.Add("@OrgId", ORGID.ToString()); + //dic.Add("@OrgId", ORGID.ToString()); if (!string.IsNullOrEmpty(filter.Parameter1)) { @@ -830,43 +830,45 @@ namespace APT.SC.WebApi.Controllers.Api.BI hiddenRanking.Add(new { NUM = NUM, - hiddenName = item[0], - qty = item[1], + companyName= item["companyName"], + ORG_ID = item["ORG_ID"], + hiddenName = item["DESCREPTION"], + qty = item["dc"], }); NUM++; } listResult.hiddenRanking = hiddenRanking; - if (string.IsNullOrEmpty(ORGID)) + //if (string.IsNullOrEmpty(ORGID)) + //{ + //全部搜索 3张表 + List hiddenList = new List(); + DataTable dt = ds.Tables[1]; + foreach (DataRow item in dt.Rows) { - //全部搜索 3张表 - List hiddenList = new List(); - DataTable dt = ds.Tables[1]; - foreach (DataRow item in dt.Rows) + hiddenList.Add(new { - hiddenList.Add(new - { - companyName = item["companyName"], - generalCount = item["generalCount"], - majorCount = item["majorCount"], - }); - } - listResult.hiddenList = hiddenList; - - List hiddenRectifyList = new List(); - dt = ds.Tables[2]; - foreach (DataRow item in dt.Rows) - { - hiddenRectifyList.Add(new - { - companyName = item["companyName"], - generalCount = item["generalCount"], - majorCount = item["majorCount"], - majorCountNo = item["majorCountNo"], - generalCountNo = item["generalCountNo"], - }); - } - listResult.hiddenRectifyList = hiddenRectifyList; + companyName = item["companyName"], + generalCount = item["generalCount"], + majorCount = item["majorCount"], + }); } + listResult.hiddenList = hiddenList; + + List hiddenRectifyList = new List(); + dt = ds.Tables[2]; + foreach (DataRow item in dt.Rows) + { + hiddenRectifyList.Add(new + { + companyName = item["companyName"], + generalCount = item["generalCount"], + majorCount = item["majorCount"], + majorCountNo = item["majorCountNo"], + generalCountNo = item["generalCountNo"], + }); + } + listResult.hiddenRectifyList = hiddenRectifyList; + //} } } catch { } @@ -948,12 +950,12 @@ namespace APT.SC.WebApi.Controllers.Api.BI .GroupBy(x => x.companyName) .Select(g => new RiskList { - companyName = g.Key, - majorCount = g.First(x => x.riskType == SKEvaluateLevelEnum.重大风险.GetDescription()).cnt, - largerCount = g.First(x => x.riskType == SKEvaluateLevelEnum.较大风险.GetDescription()).cnt, - generalCount = g.First(x => x.riskType == SKEvaluateLevelEnum.一般风险.GetDescription()).cnt, - lowCount = g.First(x => x.riskType == SKEvaluateLevelEnum.低风险.GetDescription()).cnt, - totalCount = g.Sum(x=>x.cnt) + companyName = g.Key, + majorCount = g.First(x => x.riskType == SKEvaluateLevelEnum.重大风险.GetDescription()).cnt, + largerCount = g.First(x => x.riskType == SKEvaluateLevelEnum.较大风险.GetDescription()).cnt, + generalCount = g.First(x => x.riskType == SKEvaluateLevelEnum.一般风险.GetDescription()).cnt, + lowCount = g.First(x => x.riskType == SKEvaluateLevelEnum.低风险.GetDescription()).cnt, + totalCount = g.Sum(x => x.cnt) }).ToList(); if (orgList != null && orgList.Any()) { @@ -984,7 +986,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI result.Data.riskList = riskList; result.Data.riskTypeList = riskTypeList; return result; - + } } From 97e840dd1742091410ad37965f4a9e604ce2bbb3 Mon Sep 17 00:00:00 2001 From: wyw <571921741@qq.com> Date: Wed, 6 May 2026 10:15:34 +0800 Subject: [PATCH 2/2] 2345 --- .../Controllers/Api/BIController/BIKanBanController.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 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 fda95c8..1179e87 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs @@ -824,18 +824,18 @@ namespace APT.SC.WebApi.Controllers.Api.BI if (ds != null && ds.Tables != null && ds.Tables.Count > 0) { List hiddenRanking = new List(); - int NUM = 1; + //int NUM = 1; foreach (DataRow item in ds.Tables[0].Rows) { hiddenRanking.Add(new { - NUM = NUM, + //NUM = NUM, companyName= item["companyName"], ORG_ID = item["ORG_ID"], hiddenName = item["DESCREPTION"], qty = item["dc"], }); - NUM++; + //NUM++; } listResult.hiddenRanking = hiddenRanking; //if (string.IsNullOrEmpty(ORGID))