公司级安全看板隐患不显示问题
This commit is contained in:
@@ -338,31 +338,31 @@ namespace FineUIPro.Web.common
|
||||
//一般
|
||||
allYhYb += "'" +
|
||||
((from x in hazardRegisters
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States == "3" &&
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般事故隐患" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count() +
|
||||
(from x in hazardRegisters
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States != "3" &&
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count()) + "',";
|
||||
dzgYhYb += "'" + (from x in hazardRegisters
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States != "3" &&
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count() + "',";
|
||||
|
||||
//重大
|
||||
allYhZd += "'" +
|
||||
((from x in hazardRegisters
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "重大" && x.States == "3" &&
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "重大事故隐患" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count() +
|
||||
(from x in hazardRegisters
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "重大" && x.States != "3" &&
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "重大事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count()) +
|
||||
"',";
|
||||
dzgYhZd += "'" + (from x in hazardRegisters
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "重大" && x.States != "3" &&
|
||||
where x.ProjectId == item.ProjectId && x.Risk_Level == "重大事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count() + "',";
|
||||
|
||||
@@ -559,7 +559,7 @@ namespace FineUIPro.Web.common
|
||||
if (pids == null)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "一般" && x.States == "3" &&
|
||||
where x.Risk_Level == "一般事故隐患" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
@@ -567,7 +567,7 @@ namespace FineUIPro.Web.common
|
||||
else
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "一般" && x.States == "3" &&
|
||||
where x.Risk_Level == "一般事故隐患" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
|
||||
select x).Count();
|
||||
return result;
|
||||
@@ -584,7 +584,7 @@ namespace FineUIPro.Web.common
|
||||
if (pids == null)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "一般" && x.States != "3" &&
|
||||
where x.Risk_Level == "一般事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
@@ -592,7 +592,7 @@ namespace FineUIPro.Web.common
|
||||
else
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "一般" && x.States != "3" &&
|
||||
where x.Risk_Level == "一般事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
|
||||
select x).Count();
|
||||
return result;
|
||||
@@ -606,6 +606,7 @@ namespace FineUIPro.Web.common
|
||||
public string GetGeneralZgl()
|
||||
{
|
||||
var num1 = Math.Round(100.0 * GetGeneralClosedNum() / (GetGeneralClosedNum() + GetGeneralNotClosedNum()), 0).ToString();
|
||||
if (num1 == "NaN") num1 = "0";
|
||||
return num1;
|
||||
}
|
||||
|
||||
@@ -618,7 +619,7 @@ namespace FineUIPro.Web.common
|
||||
if (pids == null)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "重大" && x.States == "3" &&
|
||||
where x.Risk_Level == "重大事故隐患" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
@@ -626,7 +627,7 @@ namespace FineUIPro.Web.common
|
||||
else
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "重大" && x.States == "3" &&
|
||||
where x.Risk_Level == "重大事故隐患" && x.States == "3" &&
|
||||
x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
|
||||
select x).Count();
|
||||
return result;
|
||||
@@ -642,7 +643,7 @@ namespace FineUIPro.Web.common
|
||||
if (pids == null)
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "重大" && x.States != "3" &&
|
||||
where x.Risk_Level == "重大事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
@@ -650,7 +651,7 @@ namespace FineUIPro.Web.common
|
||||
else
|
||||
{
|
||||
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.Risk_Level == "重大" && x.States != "3" &&
|
||||
where x.Risk_Level == "重大事故隐患" && x.States != "3" &&
|
||||
x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
|
||||
select x).Count();
|
||||
return result;
|
||||
|
||||
Reference in New Issue
Block a user