lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

公司级安全看板隐患不显示问题

Browse Source
This commit is contained in:
夏菊
2025-11-17 20:26:48 +08:00
parent eaccf33d41
commit bd6b06af0e
4 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+8 -8
View File
@@ -178,11 +178,11 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
getT = getT.Where(x => x.Risk_Level == "重大");
getT = getT.Where(x => x.Risk_Level == "重大事故隐患");
}
else
{
getT = getT.Where(x => x.Risk_Level == "一般");
getT = getT.Where(x => x.Risk_Level == "一般事故隐患");
}
cout1 = getT.Count();
}
@@ -207,11 +207,11 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
getT = getT.Where(x => x.Risk_Level == "重大");
getT = getT.Where(x => x.Risk_Level == "重大事故隐患");
}
else
{
getT = getT.Where(x => x.Risk_Level == "一般");
getT = getT.Where(x => x.Risk_Level == "一般事故隐患");
}
cout1 = getT.Count();
}
@@ -236,11 +236,11 @@ namespace FineUIPro.Web.DataShow
}
if (this.rbType.SelectedValue == "0")
{
getT = getT.Where(x => x.Risk_Level == "重大");
getT = getT.Where(x => x.Risk_Level == "重大事故隐患");
}
else
{
getT = getT.Where(x => x.Risk_Level == "一般");
getT = getT.Where(x => x.Risk_Level == "一般事故隐患");
}
cout1 = getT.Count();
}
@@ -257,11 +257,11 @@ namespace FineUIPro.Web.DataShow
var getALL = Funs.DB.HSSE_Hazard_HazardRegister.Where(x => x.ProjectId == projectId.ToString() && x.States != "4");
if (this.rbType.SelectedValue == "0")
{
getALL = getALL.Where(x => x.Risk_Level == "重大");
getALL = getALL.Where(x => x.Risk_Level == "重大事故隐患");
}
else
{
getALL = getALL.Where(x => x.Risk_Level == "一般");
getALL = getALL.Where(x => x.Risk_Level == "一般事故隐患");
}
if (datetime1.HasValue)
{
SGGL/FineUIPro.Web/common/main_new0.aspx.cs
+15 -14
View File
@@ -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;