From 698d687ebf7bbd0c195461876725ec8a98065990 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Wed, 24 Jan 2024 16:17:59 +0800 Subject: [PATCH] =?UTF-8?q?20240124=E4=B8=8A=E6=8A=A5=E9=9B=86=E5=9B=A2?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=A3=8E=E9=99=A9=E6=8E=A5=E5=8F=A3=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Project_HSSEData_HSSEService.cs | 20 ++++++++----- .../DataShow/SecurityRisk.aspx.cs | 29 ++++++++++--------- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs index fd6c1e92..5919bba3 100644 --- a/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs +++ b/SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs @@ -1302,8 +1302,9 @@ namespace BLL public static int GetGeneralRiskNum(string projectid) { var result = (from x in Funs.DB.Hazard_HazardSelectedItem - join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 2 && (x.IsStart == true || x.State == "1") + join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 2 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } @@ -1315,8 +1316,9 @@ namespace BLL public static int GetLowRiskNum(string projectid) { var result = (from x in Funs.DB.Hazard_HazardSelectedItem - join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 1 && (x.IsStart == true || x.State == "1") + join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 1 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } @@ -1328,8 +1330,9 @@ namespace BLL public static int GetMediumRiskNum(string projectid) { var result = (from x in Funs.DB.Hazard_HazardSelectedItem - join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 3 && (x.IsStart == true || x.State == "1") + join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 3 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } @@ -1341,8 +1344,9 @@ namespace BLL public static int GetHighRiskNum(string projectid) { var result = (from x in Funs.DB.Hazard_HazardSelectedItem - join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId - where x.ProjectId == projectid && y.RiskLevel == 4 && (x.IsStart == true || x.State == "1") + join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId + join z in Funs.DB.Hazard_HazardList on x.HazardListId equals z.HazardListId + where z.ProjectId == projectid && y.RiskLevel == 4 && z.CompileDate.Value.Year >= 2023 select x).Count(); return result; } diff --git a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs index e9e18080..27f301a1 100644 --- a/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/SecurityRisk.aspx.cs @@ -219,17 +219,7 @@ namespace FineUIPro.Web.DataShow } return cout4; } - /// - /// 定义变量 - /// - private static IQueryable getDataLists = from x in Funs.DB.Hazard_HazardList - select x; - /// - /// 定义变量 - /// - private static IQueryable getDataItemLists = from x in Funs.DB.Hazard_HazardSelectedItem - where (x.IsStart == true || x.State == "1") - select x; + /// /// /// @@ -238,12 +228,23 @@ namespace FineUIPro.Web.DataShow /// private int getcount(string projectId, int level) { - int count = 0; + int count = 0; var getlevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x => x.RiskLevel == level); if (getlevel != null) { - string levels = getlevel.RiskLevel.ToString(); - count = getDataItemLists.Where(x => x.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == levels)).Count(); + count = (from x in Funs.DB.Hazard_HazardSelectedItem + join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId + where y.ProjectId == projectId && (x.HazardLevel == getlevel.RiskLevelId || x.HazardLevel == level.ToString()) && y.States == Const.State_2 + && y.CompileDate.Value.Year >= 2023 + select x).Count(); + } + else + { + count = (from x in Funs.DB.Hazard_HazardSelectedItem + join y in Funs.DB.Hazard_HazardList on x.HazardListId equals y.HazardListId + where y.ProjectId == projectId && x.HazardLevel == level.ToString() && y.States == Const.State_2 + && y.CompileDate.Value.Year >= 2023 + select x).Count(); } return count; }