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;
}