From cda63ac05e9064e53bf2f04aba341d0f0a4aa6a3 Mon Sep 17 00:00:00 2001 From: wjn Date: Wed, 10 Jul 2024 17:07:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/EvaluateRiskController.cs | 11 ++++++- .../Api/BIController/BIController.cs | 29 +++++-------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs index 5bd9b6f..0b816be 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/EvaluateRiskController.cs @@ -525,7 +525,16 @@ namespace APT.HM.WebApi.Controllers.Api } if (!string.IsNullOrEmpty(dtSource.Rows[i][18].ToString().Trim()))//责任单位 { - item.DEPARTMENT_LIABLE_ID = deps.FirstOrDefault(t => t.NAME == dtSource.Rows[i][18].ToString().Trim()).ID; + var dep = deps.FirstOrDefault(t => t.NAME == dtSource.Rows[i][18].ToString().Trim()); + if (dep != null) + { + item.DEPARTMENT_LIABLE_ID = dep.ID; + } + else + { + var depName = dtSource.Rows[i][18].ToString().Trim(); + } + } if (!string.IsNullOrEmpty(dtSource.Rows[i][19].ToString().Trim()))//责任岗位 { diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs index 7da8670..7c18934 100644 --- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs +++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIController.cs @@ -28,7 +28,7 @@ namespace APT.SC.WebApi.Controllers.Api.BI [Route("api/BI/BIController")] public class BIController : APTApiController { - + public class GoViewDataReturn { public int code { get; set; } @@ -213,7 +213,6 @@ namespace APT.SC.WebApi.Controllers.Api.BI var measure3 = GetEntities(t => t.IS_DELETED == false, measureFilter).Select(t => t.NAME).Distinct().Count(); var measure4 = GetEntities(t => t.IS_DELETED == false, measureFilter).Select(t => t.NAME).Distinct().Count(); var measure5 = GetEntities(t => t.IS_DELETED == false, measureFilter).Select(t => t.NAME).Distinct().Count(); - //var distinctDepartment = allrisk.Select(t => new { t.SOURCE_DEPARTMENT_ID, t.Nav_SourceDepartment.NAME }).Distinct(); var distinctDepartment = GetEntities(t => t.DEPARTMENT_TYPE == 0, new BaseFilter(filter.GetOrgId())); riskData riskData = new riskData(); @@ -234,24 +233,12 @@ namespace APT.SC.WebApi.Controllers.Api.BI var distinctArea = allrisk.Select(t => new { t.AREA_ID, AreaName = t.Nav_Area.NAME, SourceDepartmentName = t.Nav_SourceDepartment.NAME }).Distinct(); foreach (var area in distinctArea) { - - if (area.SourceDepartmentName.Contains("矿山") || area.SourceDepartmentName.Contains("选矿")) - { - areaCountModel item = new areaCountModel(); - - if (area.SourceDepartmentName.Contains("矿山")) - { - item.AREATYPE = 0; - } - else - { - item.AREATYPE = 1; - } - item.AREANAME = area.AreaName; - item.AREACOUNT = allrisk.Count(t => t.AREA_ID == area.AREA_ID); - item2s.Add(item); - } + areaCountModel item = new areaCountModel(); + item.AREANAME = area.AreaName; + item.AREACOUNT = allrisk.Count(t => t.AREA_ID == area.AREA_ID); + item2s.Add(item); } + var currMonth = DateTime.Now.Month; DateTime today = DateTime.Today; for (var i = 1; i < currMonth + 1; i++) @@ -581,10 +568,10 @@ namespace APT.SC.WebApi.Controllers.Api.BI sDatas.Add(Data); } } - var orderData = sDatas.OrderBy(t => t.NAME1).ThenBy(t=>t.NAME7).ToList(); + var orderData = sDatas.OrderBy(t => t.NAME1).ThenBy(t => t.NAME7).ToList(); return orderData; }); } - + } }