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

提交代码

This commit is contained in:
高飞 2023-11-03 16:01:12 +08:00
parent b0e1999b85
commit caf59625ff
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs
View File

@ -167,7 +167,10 @@ namespace FineUIPro.Web
listCategories.Add(getunits.ShortUnitName ?? getunits.UnitCode); listCategories.Add(getunits.ShortUnitName ?? getunits.UnitCode);
var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == getunits.UnitId); var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == getunits.UnitId);
var noW = unitHazardRegisters.Where(x => x.States != "3"); var noW = unitHazardRegisters.Where(x => x.States != "3");
listdata.Add(unitHazardRegisters.Count() - noW.Count()); //listdata.Add(unitHazardRegisters.Count() - noW.Count());
//listdata2.Add(unitHazardRegisters.Count());
listdata.Add(unitHazardRegisters.Where(x=>x.States=="1").Count());
listdata2.Add(unitHazardRegisters.Count()); listdata2.Add(unitHazardRegisters.Count());
} }
} }
@ -181,7 +184,9 @@ namespace FineUIPro.Web
listCategories.Add(unit.ShortUnitName ?? unit.UnitCode); listCategories.Add(unit.ShortUnitName ?? unit.UnitCode);
var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == unit.UnitId); var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == unit.UnitId);
var noW = unitHazardRegisters.Where(x => x.States != "3"); var noW = unitHazardRegisters.Where(x => x.States != "3");
listdata.Add(unitHazardRegisters.Count() - noW.Count()); //listdata.Add(unitHazardRegisters.Count() - noW.Count());
//listdata2.Add(unitHazardRegisters.Count());
listdata.Add(unitHazardRegisters.Where(x => x.States == "1").Count());
listdata2.Add(unitHazardRegisters.Count()); listdata2.Add(unitHazardRegisters.Count());
} }
} }

5
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -61,7 +61,10 @@ namespace FineUIPro.Web.common
//安全培训累计人员 //安全培训累计人员
var getTrainRecord = db.EduTrain_TrainRecord.Where(x => x.ProjectId == ProjectId).Max(x => x.TrainPersonNum) ?? 0; var getTrainRecord = db.EduTrain_TrainRecord.Where(x => x.ProjectId == ProjectId).Max(x => x.TrainPersonNum) ?? 0;
this.divSafePersonNum.InnerHtml = getTrainRecord.ToString(); //修改：增加博晟教育中的人数
var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => x.ProjectId == ProjectId && (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
this.divSafePersonNum.InnerHtml = (getTrainRecord+ boShengCount).ToString();
//安全管理人员 //安全管理人员
var allSum = from x in Funs.DB.SitePerson_Person var allSum = from x in Funs.DB.SitePerson_Person

4
SGGL/FineUIPro.Web/common/main_new.aspx.cs
View File

@ -52,7 +52,9 @@ namespace FineUIPro.Web.common
//安全培训累计人员 //安全培训累计人员
var getTrainRecord = db.EduTrain_TrainRecord.Max(x=>x.TrainPersonNum)??0; var getTrainRecord = db.EduTrain_TrainRecord.Max(x=>x.TrainPersonNum)??0;
this.divSafePersonNum.InnerHtml = getTrainRecord.ToString(); //修改：增加博晟教育中的人数
var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
//安全管理人员 //安全管理人员
var allSum = from x in Funs.DB.SitePerson_Person var allSum = from x in Funs.DB.SitePerson_Person