20240102安全风险数据修正及上报集团方法调整
This commit is contained in:
@@ -1303,8 +1303,8 @@ namespace BLL
|
||||
{
|
||||
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
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && y.RiskLevel == 2 && (x.IsStart == true || x.State == "1")
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1316,8 +1316,8 @@ namespace BLL
|
||||
{
|
||||
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
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && y.RiskLevel == 1 && (x.IsStart == true || x.State == "1")
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1329,8 +1329,8 @@ namespace BLL
|
||||
{
|
||||
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
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && y.RiskLevel == 3 && (x.IsStart == true || x.State == "1")
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1342,8 +1342,8 @@ namespace BLL
|
||||
{
|
||||
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
|
||||
select x).Count();
|
||||
where x.ProjectId == projectid && y.RiskLevel == 4 && (x.IsStart == true || x.State == "1")
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user