lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2023-11-16 10:28:21 +08:00
parent de1d676960 7fef771f73
commit 01b3095402
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
+25 -26
View File
@@ -1193,15 +1193,15 @@ namespace BLL
/// <returns></returns>
public static int GetUseEquipmentNum(string projectid)
{
/*var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
where y.ProjectId == projectid
select x).Count() +
(from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
.GeneralEquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
select x).Count();*/
where y.ProjectId == projectid
select x).Count();
return 0;
}
@@ -1211,10 +1211,10 @@ namespace BLL
/// <returns></returns>
public static int GetSpecialEquipmentNum(string projectid)
{
/*var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
where y.ProjectId == projectid && x.IsUsed == true
select x).Count();*/
where y.ProjectId == projectid
select x).Count();
return 0;
}
@@ -1224,9 +1224,9 @@ namespace BLL
/// <returns></returns>
public static int GetLicensesNum(string projectid)
{
/*var result = (from x in Funs.DB.License_LicenseManager
where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
select x).Count();*/
var result = (from x in Funs.DB.License_LicenseManager
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
select x).Count();
return 0;
}
@@ -1236,10 +1236,10 @@ namespace BLL
/// <returns></returns>
public static int GetLicensesCloseNum(string projectid)
{
/*var result = (from x in Funs.DB.License_LicenseManager
where x.ProjectId == projectid && x.IsHighRisk == true && x.WorkStates == "3" &&
var result = (from x in Funs.DB.License_LicenseManager
where x.ProjectId == projectid && x.WorkStates == "3" &&
x.CompileDate > Const.DtmarkTime
select x).Count();*/
select x).Count();
return 0;
}
@@ -1249,10 +1249,9 @@ namespace BLL
/// <returns></returns>
public static int GetGeneralClosedNum(string projectid)
{
/*var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States == "3" &&
x.CheckTime > Const.DtmarkTime
select x).Count();*/
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && (x.HazardValue == "0.3" || x.HazardValue == "1" || x.HazardValue == null) && x.States == "3" && x.CheckTime > Const.DtmarkTime
select x).Count();
return 0;
}
@@ -1262,10 +1261,10 @@ namespace BLL
/// <returns></returns>
public static int GetGeneralNotClosedNum(string projectid)
{
/*var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "一般" && x.States != "3" &&
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && (x.HazardValue == "0.3" || x.HazardValue == "1" || x.HazardValue == null) && x.States != "3" &&
x.CheckTime > Const.DtmarkTime
select x).Count();*/
select x).Count();
return 0;
}
@@ -1275,10 +1274,10 @@ namespace BLL
/// <returns></returns>
public static int GetMajorClosedNum(string projectid)
{
/*var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States == "3" &&
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.HazardValue == "3" && x.States == "3" &&
x.CheckTime > Const.DtmarkTime
select x).Count();*/
select x).Count();
return 0;
}
@@ -1288,10 +1287,10 @@ namespace BLL
/// <returns></returns>
public static int GetMajorNotClosedNum(string projectid)
{
/*var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.Risk_Level == "重大" && x.States != "3" &&
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.ProjectId == projectid && x.HazardValue == "3" && x.States != "3" &&
x.CheckTime > Const.DtmarkTime
select x).Count();*/
select x).Count();
return 0;
}