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

提交代码

Browse Source
This commit is contained in:
高飞
2023-09-08 17:09:44 +08:00
parent 47f9a0e959
commit 42d3d45c5c
16 changed files with 4544 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APICheckSpecialService.cs
+4 -4
View File
@@ -237,7 +237,7 @@ namespace BLL
CheckItemDetailSetId = x.CheckItemSetId,
CheckItemDetailContent = x.CheckItemSetContent,
Rectification_Date = x.Rectification_Date
Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
};
return getInfo.ToList();
}
@@ -289,7 +289,7 @@ namespace BLL
CheckItemDetailSetId=x.CheckItemSetId,
CheckItemDetailContent=x.CheckItemSetContent,
Rectification_Date=x.Rectification_Date
Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
};
return getInfo.First();
}
@@ -328,7 +328,7 @@ namespace BLL
//整改日期、检查内容、检查内容id
CheckItemSetId= newDetail.CheckItemDetailSetId,
CheckItemSetContent= newDetail.CheckItemDetailContent,
Rectification_Date=newDetail.Rectification_Date
Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date)
};
if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
{
@@ -374,7 +374,7 @@ namespace BLL
//整改日期、检查内容、检查内容id
updateDetail.CheckItemSetId = newDetail.CheckItemDetailSetId;
updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
updateDetail.Rectification_Date = newDetail.Rectification_Date;
updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
db.SubmitChanges();
}
////保存附件
SGGL/BLL/API/HSSE/APILicenseDataService.cs
+496 -11
View File
@@ -58,6 +58,11 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.FireWorkId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireLevel = x.FireLevel
}).FirstOrDefault();
}
#endregion
@@ -96,6 +101,14 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.HeightWorkId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
WorkHeight = x.WorkHeight,
HeightLevel = x.HeightLevel,
FireWatchManName = x.FireWatchManName,
WorkLeaderName = x.WorkLeaderName,
WorkLeaderTel = x.WorkLeaderTel,
}).FirstOrDefault();
}
#endregion
@@ -134,6 +147,16 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.LimitedSpaceId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
LimitedDescribe = x.LimitedDescribe,
IsBoolOther = x.IsBoolOther,
IsBoolHarmfulGas = x.IsBoolHarmfulGas,
TestResult = x.TestResult,
TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
TestPerson = x.TestPerson,
VenStep = x.VenStep,
}).FirstOrDefault();
}
#endregion
@@ -177,6 +200,9 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.RadialWorkId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
}).FirstOrDefault();
}
#endregion
@@ -215,6 +241,11 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.OpenCircuitId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
}).FirstOrDefault();
}
#endregion
@@ -252,6 +283,11 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.BreakGroundId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
}).FirstOrDefault();
}
#endregion
@@ -332,6 +368,60 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.LiftingWorkId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
LiftingHeight = x.LiftingHeight,
FireWatchManName = x.FireWatchManName,
WorkLeaderName = x.WorkLeaderName,
WorkLeaderTel = x.WorkLeaderTel,
QzgName = x.QzgName,
QzgPhone = x.QzgPhone,
}).FirstOrDefault();
}
#endregion
#region 临时用电作业票
if (strMenuId == Const.ProjectElectricityMenuId)
{
getInfo = (from x in db.License_Electricity
where x.ElectricityId == id
select new Model.LicenseDataItem
{
LicenseId = x.ElectricityId,
MenuId = strMenuId,
ProjectId = x.ProjectId,
LicenseCode = x.LicenseCode,
ApplyUnitId = x.ApplyUnitId,
ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName,
ApplyManId = x.ApplyManId,
ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName,
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
WorkPalce = x.WorkPalce,
WorkDepth = x.WorkDepth,
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
WorkMeasures = x.WorkMeasures,
CancelManId = x.CancelManId,
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
CancelReasons = x.CancelReasons,
CancelTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CancelTime),
CloseManId = x.CloseManId,
CloseManName = db.Sys_User.First(u => u.UserId == x.CloseManId).UserName,
CloseReasons = x.CloseReasons,
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
NextManId = x.NextManId,
NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName,
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.ElectricityId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel
}).FirstOrDefault();
}
#endregion
@@ -419,6 +509,11 @@ namespace BLL
CloseReasons = x.CloseReasons,
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason=x.Reason,
FireLevel=x.FireLevel
}).ToList();
}
#endregion
@@ -455,6 +550,15 @@ namespace BLL
CloseReasons = x.CloseReasons,
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
WorkHeight=x.WorkHeight,
HeightLevel=x.HeightLevel,
FireWatchManName=x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel,
}).ToList();
}
#endregion
@@ -491,6 +595,20 @@ namespace BLL
CloseReasons = x.CloseReasons,
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
LimitedDescribe=x.LimitedDescribe,
IsBoolOther=x.IsBoolOther,
IsBoolHarmfulGas=x.IsBoolHarmfulGas,
TestResult=x.TestResult,
TestDate= string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
TestPerson=x.TestPerson,
VenStep=x.VenStep,
}).ToList();
}
#endregion
@@ -534,6 +652,10 @@ namespace BLL
NextManId = x.NextManId,
NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName,
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
}).ToList();
}
#endregion
@@ -570,6 +692,12 @@ namespace BLL
CloseReasons = x.CloseReasons,
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason=x.Reason,
FireWatchManName=x.FireWatchManName,
}).ToList();
}
#endregion
@@ -605,6 +733,12 @@ namespace BLL
CloseReasons = x.CloseReasons,
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason=x.Reason,
FireWatchManName=x.FireWatchManName,
}).ToList();
}
#endregion
@@ -685,6 +819,60 @@ namespace BLL
NextManId = x.NextManId,
NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName,
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
LiftingHeight=x.LiftingHeight,
FireWatchManName=x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel,
QzgName=x.QzgName,
QzgPhone=x.QzgPhone,
}).ToList();
}
#endregion
#region 临时用电作业票
if (strMenuId == Const.ProjectElectricityMenuId)
{
getInfoList = (from x in db.License_Electricity
where x.ProjectId == projectId && (x.ApplyUnitId == unitId || unitId == null)
&& (states == null || x.States == states)
orderby x.LicenseCode descending
select new Model.LicenseDataItem
{
LicenseId = x.ElectricityId,
MenuId = strMenuId,
ProjectId = x.ProjectId,
LicenseCode = x.LicenseCode,
ApplyUnitId = x.ApplyUnitId,
ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName,
ApplyManId = x.ApplyManId,
ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName,
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
WorkPalce = x.WorkPalce,
WorkDepth = x.WorkDepth,
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
WorkMeasures = x.WorkMeasures,
CancelManId = x.CancelManId,
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
CancelReasons = x.CancelReasons,
CancelTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CancelTime),
CloseManId = x.CloseManId,
CloseManName = db.Sys_User.First(u => u.UserId == x.CloseManId).UserName,
CloseReasons = x.CloseReasons,
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel,
}).ToList();
}
#endregion
@@ -760,6 +948,11 @@ namespace BLL
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireLevel = x.FireLevel
}).ToList();
if (getFireWork.Count() > 0)
{
@@ -788,6 +981,14 @@ namespace BLL
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
WorkHeight = x.WorkHeight,
HeightLevel = x.HeightLevel,
FireWatchManName = x.FireWatchManName,
WorkLeaderName = x.WorkLeaderName,
WorkLeaderTel = x.WorkLeaderTel,
}).ToList();
if (getHeightWork.Count() > 0)
{
@@ -815,6 +1016,17 @@ namespace BLL
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
LimitedDescribe = x.LimitedDescribe,
IsBoolOther = x.IsBoolOther,
IsBoolHarmfulGas = x.IsBoolHarmfulGas,
TestResult = x.TestResult,
TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
TestPerson = x.TestPerson,
VenStep = x.VenStep,
}).ToList();
if (getLimitedSpace.Count() > 0)
{
@@ -843,6 +1055,9 @@ namespace BLL
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
WorkPalce = x.WorkPalce,
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
}).ToList();
if (getRadialWork.Count() > 0)
{
@@ -871,6 +1086,11 @@ namespace BLL
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
RoadName = x.RoadName,
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
}).ToList();
if (getOpenCircuit.Count() > 0)
{
@@ -899,6 +1119,11 @@ namespace BLL
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
}).ToList();
if (getBreakGround.Count() > 0)
{
@@ -954,6 +1179,15 @@ namespace BLL
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
LiftingHeight = x.LiftingHeight,
FireWatchManName = x.FireWatchManName,
WorkLeaderName = x.WorkLeaderName,
WorkLeaderTel = x.WorkLeaderTel,
QzgName = x.QzgName,
QzgPhone = x.QzgPhone,
}).ToList();
if (getLiftingWork.Count() > 0)
{
@@ -961,6 +1195,41 @@ namespace BLL
}
#endregion
#region 临时用电作业票
var getElectricity = (from x in db.License_Electricity
where x.ProjectId == projectId && (x.ApplyUnitId == unitId || unitId == null)
&& (states == null || x.States == states)
select new Model.LicenseDataItem
{
LicenseId = x.ElectricityId,
MenuId = Const.ProjectElectricityMenuId,
MenuName = "临时用电",
ProjectId = x.ProjectId,
LicenseCode = x.LicenseCode,
ApplyUnitId = x.ApplyUnitId,
ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName,
ApplyManId = x.ApplyManId,
ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName,
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
WorkPalce = x.WorkPalce,
WorkDepth = x.WorkDepth,
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
States = x.States,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel,
}).ToList();
if (getElectricity.Count() > 0)
{
getInfoList.AddRange(getElectricity);
}
#endregion
#region 作业票【定稿 】"待开工"="1";"作业中"="2";"已关闭"="3";"已取消"="-1"
var getLicenseManager = (from x in db.License_LicenseManager
where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null)
@@ -1106,6 +1375,10 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId,
Reason=newItem.Reason,
FireLevel=newItem.FireLevel
};
if (newItem.States == Const.State_0)
@@ -1156,6 +1429,10 @@ namespace BLL
updateFireWork.WorkMeasures = newFireWork.WorkMeasures;
updateFireWork.NextManId = newFireWork.NextManId;
updateFireWork.States = newFireWork.States;
updateFireWork.WorkAreaId = newItem.WorkAreaId;
updateFireWork.Reason = newItem.Reason;
updateFireWork.FireLevel = newItem.FireLevel;
}
updateFireWork.States = newFireWork.States;
}
@@ -1186,6 +1463,15 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId,
WorkHeight=newItem.WorkHeight,
HeightLevel=newItem.HeightLevel,
FireWatchManName=newItem.FireWatchManName,
WorkLeaderName=newItem.WorkLeaderName,
WorkLeaderTel=newItem.WorkLeaderTel,
};
if (newItem.States == Const.State_0)
{
@@ -1236,6 +1522,12 @@ namespace BLL
updateHeightWork.EquipmentTools = newHeightWork.EquipmentTools;
updateHeightWork.NextManId = newHeightWork.NextManId;
updateHeightWork.States = newHeightWork.States;
updateHeightWork.WorkAreaId = newItem.WorkAreaId;
updateHeightWork.WorkHeight = newItem.WorkHeight;
updateHeightWork.HeightLevel = newItem.HeightLevel;
updateHeightWork.FireWatchManName = newItem.FireWatchManName;
updateHeightWork.WorkLeaderName = newItem.WorkLeaderName;
updateHeightWork.WorkLeaderTel = newItem.WorkLeaderTel;
}
updateHeightWork.States = newHeightWork.States;
}
@@ -1266,6 +1558,14 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
LimitedDescribe=newItem.LimitedDescribe,
IsBoolOther=newItem.IsBoolOther,
IsBoolHarmfulGas=newItem.IsBoolHarmfulGas,
TestResult=newItem.TestResult,
TestDate= Funs.GetNewDateTime(newItem.TestDate),
TestPerson=newItem.TestPerson,
VenStep=newItem.VenStep
};
if (newItem.States == Const.State_0)
{
@@ -1315,6 +1615,14 @@ namespace BLL
updateLimitedSpace.WorkMeasures = newLimitedSpace.WorkMeasures;
updateLimitedSpace.NextManId = newLimitedSpace.NextManId;
updateLimitedSpace.States = newLimitedSpace.States;
updateLimitedSpace.LimitedDescribe = newItem.LimitedDescribe;
updateLimitedSpace.IsBoolOther = newItem.IsBoolOther;
updateLimitedSpace.IsBoolHarmfulGas = newItem.IsBoolHarmfulGas;
updateLimitedSpace.TestResult = newItem.TestResult;
updateLimitedSpace.TestDate = Funs.GetNewDateTime(newItem.TestDate);
updateLimitedSpace.TestPerson = newItem.TestPerson;
updateLimitedSpace.VenStep = newItem.VenStep;
}
updateLimitedSpace.States = newLimitedSpace.States;
}
@@ -1348,6 +1656,8 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId
};
if (newItem.States == Const.State_0)
{
@@ -1400,6 +1710,7 @@ namespace BLL
updateRadialWork.WatchManContact = newRadialWork.WatchManContact;
updateRadialWork.NextManId = newRadialWork.NextManId;
updateRadialWork.States = newRadialWork.States;
updateRadialWork.WorkAreaId = newItem.WorkAreaId;
}
updateRadialWork.States = newRadialWork.States;
}
@@ -1430,6 +1741,11 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId,
Reason=newItem.Reason,
FireWatchManName=newItem.FireWatchManName,
};
if (newItem.States == Const.State_0)
{
@@ -1479,6 +1795,10 @@ namespace BLL
updateOpenCircuit.SafeMeasures = newOpenCircuit.SafeMeasures;
updateOpenCircuit.NextManId = newOpenCircuit.NextManId;
updateOpenCircuit.States = newOpenCircuit.States;
updateOpenCircuit.WorkAreaId = newItem.WorkAreaId;
updateOpenCircuit.Reason = newItem.Reason;
updateOpenCircuit.FireWatchManName = newItem.FireWatchManName;
}
updateOpenCircuit.States = newOpenCircuit.States;
}
@@ -1508,6 +1828,10 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId,
Reason=newItem.Reason,
FireWatchManName=newItem.FireWatchManName
};
if (newItem.States == Const.State_0)
{
@@ -1556,6 +1880,10 @@ namespace BLL
updateBreakGround.WorkMeasures = newBreakGround.WorkMeasures;
updateBreakGround.NextManId = newBreakGround.NextManId;
updateBreakGround.States = newBreakGround.States;
updateBreakGround.WorkAreaId = newItem.WorkAreaId;
updateBreakGround.Reason = newItem.Reason;
updateBreakGround.FireWatchManName = newItem.FireWatchManName;
}
updateBreakGround.States = newBreakGround.States;
}
@@ -1669,6 +1997,15 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId,
LiftingHeight=newItem.LiftingHeight,
FireWatchManName=newItem.FireWatchManName,
WorkLeaderName=newItem.WorkLeaderName,
WorkLeaderTel=newItem.WorkLeaderTel,
QzgName=newItem.QzgName,
QzgPhone=newItem.QzgPhone,
};
if (newItem.States == Const.State_0)
{
@@ -1718,12 +2055,112 @@ namespace BLL
updateLiftingWork.CraneCapacity = newLiftingWork.CraneCapacity;
updateLiftingWork.NextManId = newLiftingWork.NextManId;
updateLiftingWork.States = newLiftingWork.States;
updateLiftingWork.WorkAreaId = newItem.WorkAreaId;
updateLiftingWork.LiftingHeight = newItem.LiftingHeight;
updateLiftingWork.FireWatchManName = newItem.FireWatchManName;
updateLiftingWork.WorkLeaderName = newItem.WorkLeaderName;
updateLiftingWork.WorkLeaderTel = newItem.WorkLeaderTel;
updateLiftingWork.QzgName = newItem.QzgName;
updateLiftingWork.QzgPhone = newItem.QzgPhone;
}
updateLiftingWork.States = newLiftingWork.States;
}
}
#endregion
#region 临时用电作业票
if (newItem.MenuId == Const.ProjectElectricityMenuId)
{
Model.License_Electricity newElectricity = new Model.License_Electricity
{
ElectricityId = strLicenseId,
ProjectId = projectId,
LicenseCode = newItem.LicenseCode,
ApplyUnitId = newItem.ApplyUnitId,
ApplyManId = newItem.ApplyManId,
ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate),
WorkPalce = newItem.WorkPalce,
WorkDepth = newItem.WorkDepth,
ValidityStartTime = Funs.GetNewDateTime(newItem.ValidityStartTime),
ValidityEndTime = Funs.GetNewDateTime(newItem.ValidityEndTime),
WorkMeasures = newItem.WorkMeasures,
CancelManId = newItem.CancelManId,
CancelReasons = newItem.CancelReasons,
CancelTime = Funs.GetNewDateTime(newItem.CancelTime),
CloseManId = newItem.CloseManId,
CloseReasons = newItem.CloseReasons,
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId = newItem.WorkAreaId,
Reason = newItem.Reason,
FireWatchManName = newItem.FireWatchManName,
WorkLeaderName= newItem.WorkLeaderName,
WorkLeaderTel = newItem.WorkLeaderTel
};
if (newItem.States == Const.State_0)
{
newElectricity.NextManId = newItem.ApplyManId;
}
////保存
var updateElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == strLicenseId);
if (updateElectricity == null)
{
newElectricity.ApplyDate = DateTime.Now;
strLicenseId = newElectricity.ElectricityId = SQLHelper.GetNewID();
newElectricity.OldLicenseId = newItem.OldLicenseId;
newItem.LicenseCode = newElectricity.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectElectricityMenuId, newElectricity.ProjectId, newElectricity.ApplyUnitId);
db.License_Electricity.InsertOnSubmit(newElectricity);
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectElectricityMenuId, newElectricity.ProjectId, newElectricity.ApplyUnitId, newElectricity.ElectricityId, newElectricity.ApplyDate);
}
else
{
if (newItem.States == Const.State_3)
{
updateElectricity.CloseManId = newElectricity.CloseManId;
updateElectricity.CloseReasons = newElectricity.CloseReasons;
updateElectricity.CloseTime = DateTime.Now;
if (newElectricity.ValidityEndTime.HasValue && newElectricity.ValidityEndTime < DateTime.Now)
{
updateElectricity.CloseTime = newElectricity.ValidityEndTime;
}
}
else if (newItem.States == Const.State_R)
{
updateElectricity.CancelManId = newElectricity.CancelManId;
updateElectricity.CancelReasons = newElectricity.CancelReasons;
updateElectricity.CancelTime = DateTime.Now;
if (newElectricity.ValidityEndTime.HasValue && newElectricity.ValidityEndTime < DateTime.Now)
{
updateElectricity.CancelTime = newElectricity.ValidityEndTime;
}
}
else
{
updateElectricity.WorkPalce = newElectricity.WorkPalce;
updateElectricity.WorkDepth = newElectricity.WorkDepth;
updateElectricity.ValidityStartTime = newElectricity.ValidityStartTime;
updateElectricity.ValidityEndTime = newElectricity.ValidityEndTime;
updateElectricity.WorkMeasures = newElectricity.WorkMeasures;
updateElectricity.NextManId = newElectricity.NextManId;
updateElectricity.States = newElectricity.States;
updateElectricity.WorkAreaId = newItem.WorkAreaId;
updateElectricity.Reason = newItem.Reason;
updateElectricity.FireWatchManName = newItem.FireWatchManName;
updateElectricity.WorkLeaderName = newItem.WorkLeaderName;
updateElectricity.WorkLeaderTel = newItem.WorkLeaderTel;
}
updateElectricity.States = newElectricity.States;
}
}
#endregion
#region 作业票【定稿】
if (newItem.MenuId == Const.ProjectLicenseManagerMenuId)
{
@@ -1880,23 +2317,26 @@ namespace BLL
#region 新增下一步审核记录
if (newItem.IsAgree == true)
{
var getCloseAllOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && (!x.IsClosed.HasValue || x.IsClosed == false) && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false));
if (getCloseAllOperate == null)
{
var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && x.IsFlowEnd == true);
////判断审核步骤是否结束
if (getNextFlowOperate != null)
{
/////最后一步是关闭所有 步骤
getNextFlowOperate.IsClosed = true;
//修改只需要一个人审批直接通过
//var getCloseAllOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && (!x.IsClosed.HasValue || x.IsClosed == false) && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false));
//if (getCloseAllOperate == null)
//{
//var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && x.IsFlowEnd == true);
var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId);
// ////判断审核步骤是否结束
// if (getNextFlowOperate != null)
// {
/////最后一步是关闭所有 步骤
getNextFlowOperate.IsClosed = true;
getNextFlowOperate.OperaterTime = DateTime.Now;
getNextFlowOperate.IsAgree = true;
getNextFlowOperate.OperaterId = newItem.OperaterId;
getNextFlowOperate.Opinion = "审核完成！";
boolIsFlowEnd = true;
db.SubmitChanges();
}
}
// }
//}
#region 动火作业票
if (strMenuId == Const.ProjectFireWorkMenuId)
@@ -2163,6 +2603,39 @@ namespace BLL
}
#endregion
#region 临时用电作业票
if (strMenuId == Const.ProjectElectricityMenuId)
{
var getElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == updateFlowOperate.DataId);
if (getElectricity != null)
{
getElectricity.NextManId = newItem.NextOperaterId;
if (newItem.IsAgree == true)
{
if (boolIsFlowEnd == true)
{
getElectricity.NextManId = null;
getElectricity.States = Const.State_2;
if (getElectricity.ValidityStartTime.HasValue && getElectricity.ValidityStartTime < DateTime.Now)
{
int days = 7;
if (getElectricity.ValidityEndTime.HasValue)
{
days = Convert.ToInt32((getElectricity.ValidityEndTime - getElectricity.ValidityStartTime).Value.TotalDays);
}
getElectricity.ValidityStartTime = DateTime.Now;
getElectricity.ValidityEndTime = DateTime.Now.AddDays(days);
}
}
}
else
{
getElectricity.States = Const.State_0;
}
db.SubmitChanges();
}
}
#endregion
if (!boolIsFlowEnd && !string.IsNullOrEmpty(newItem.NextOperaterId))
{
List<string> getUserIds = Funs.GetStrListByStr(newItem.NextOperaterId, ',');
@@ -2291,6 +2764,7 @@ namespace BLL
var getAllFlows = from x in db.License_FlowOperate
where x.DataId == licenseInfo.LicenseId && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false)
select x;
if (licenseInfo == null || string.IsNullOrEmpty(licenseInfo.LicenseId) || getAllFlows.Count() == 0)
{
getFlowOperate = (from x in db.Sys_MenuFlowOperate
@@ -2617,6 +3091,17 @@ namespace BLL
}
#endregion
#region 临时用电作业票
else if (newItem.MenuId == Const.ProjectElectricityMenuId)
{
var updateElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == strLicenseId);
if (updateElectricity == null)
{
updateElectricity.NextManId = null;
updateElectricity.States = Const.State_C;
}
}
#endregion
db.SubmitChanges();
}
SGGL/BLL/Common/Const.cs
+9
View File
@@ -291,6 +291,11 @@ namespace BLL
/// </summary>
public static string WorkPost_SafetyManager = "e426e560-9906-4aba-843e-2daef9ebeb05";
/// <summary>
/// HSE副经理岗位Id
/// </summary>
public static string WorkPost_SafetyManagerFu = "46AA7960-1D35-4D5B-8C8F-AA4C874D63C8";
/// <summary>
/// 无损检测工岗位Id
/// </summary>
@@ -1946,6 +1951,10 @@ namespace BLL
/// 吊装作业票
/// </summary>
public const string ProjectLiftingWorkMenuId = "A1BE3AB6-9D4A-41E7-8870-E73423165451";
/// <summary>
/// 临时用电作业票
/// </summary>
public const string ProjectElectricityMenuId = "48F64E0F-38B2-4BDC-9B61-6200BD02CBF5";
#endregion
#region HSSE检查管理
SGGL/BLL/HSSE/License/LicensePublicService.cs
+195 -1
View File
@@ -76,6 +76,11 @@ namespace BLL
CloseTime = fireWork.CloseTime,
NextManId=fireWork.NextManId,
States = fireWork.States,
WorkAreaId=fireWork.WorkAreaId,
Reason=fireWork.Reason,
FireLevel=fireWork.FireLevel,
};
db.License_FireWork.InsertOnSubmit(newFireWork);
db.SubmitChanges();
@@ -105,7 +110,11 @@ namespace BLL
newFireWork.CloseReasons = fireWork.CloseReasons;
newFireWork.CloseTime = fireWork.CloseTime;
newFireWork.NextManId = fireWork.NextManId;
newFireWork.States = fireWork.States;
newFireWork.States = fireWork.States;
newFireWork.WorkAreaId = fireWork.WorkAreaId;
newFireWork.Reason = fireWork.Reason;
newFireWork.FireLevel = fireWork.FireLevel;
db.SubmitChanges();
}
}
@@ -172,6 +181,14 @@ namespace BLL
CloseTime = heightWork.CloseTime,
NextManId = heightWork.NextManId,
States = heightWork.States,
WorkAreaId=heightWork.WorkAreaId,
WorkHeight=heightWork.WorkHeight,
HeightLevel=heightWork.HeightLevel,
FireWatchManName=heightWork.FireWatchManName,
WorkLeaderName=heightWork.WorkLeaderName,
WorkLeaderTel= heightWork.WorkLeaderTel,
};
db.License_HeightWork.InsertOnSubmit(newHeightWork);
db.SubmitChanges();
@@ -203,6 +220,13 @@ namespace BLL
newHeightWork.CloseTime = heightWork.CloseTime;
newHeightWork.NextManId = heightWork.NextManId;
newHeightWork.States = heightWork.States;
newHeightWork.WorkAreaId = heightWork.WorkAreaId;
newHeightWork.WorkHeight = heightWork.WorkHeight;
newHeightWork.HeightLevel = heightWork.HeightLevel;
newHeightWork.FireWatchManName = heightWork.FireWatchManName;
newHeightWork.WorkLeaderName = heightWork.WorkLeaderName;
newHeightWork.WorkLeaderTel = heightWork.WorkLeaderTel;
db.SubmitChanges();
}
}
@@ -269,6 +293,16 @@ namespace BLL
CloseTime = limitedSpace.CloseTime,
NextManId = limitedSpace.NextManId,
States = limitedSpace.States,
WorkAreaId=limitedSpace.WorkAreaId,
LimitedDescribe=limitedSpace.LimitedDescribe,
IsBoolOther=limitedSpace.IsBoolOther,
IsBoolHarmfulGas=limitedSpace.IsBoolHarmfulGas,
TestResult=limitedSpace.TestResult,
TestDate=limitedSpace.TestDate,
TestPerson=limitedSpace.TestPerson,
VenStep=limitedSpace.VenStep,
};
db.License_LimitedSpace.InsertOnSubmit(newLimitedSpace);
db.SubmitChanges();
@@ -299,6 +333,15 @@ namespace BLL
newLimitedSpace.CloseTime = limitedSpace.CloseTime;
newLimitedSpace.NextManId = limitedSpace.NextManId;
newLimitedSpace.States = limitedSpace.States;
newLimitedSpace.WorkAreaId = limitedSpace.WorkAreaId;
newLimitedSpace.LimitedDescribe = limitedSpace.LimitedDescribe;
newLimitedSpace.IsBoolOther = limitedSpace.IsBoolOther;
newLimitedSpace.IsBoolHarmfulGas = limitedSpace.IsBoolHarmfulGas;
newLimitedSpace.TestResult = limitedSpace.TestResult;
newLimitedSpace.TestDate = limitedSpace.TestDate;
newLimitedSpace.TestPerson = limitedSpace.TestPerson;
newLimitedSpace.VenStep = limitedSpace.VenStep;
db.SubmitChanges();
}
}
@@ -368,6 +411,9 @@ namespace BLL
CloseTime = radialWork.CloseTime,
NextManId = radialWork.NextManId,
States = radialWork.States,
WorkAreaId=radialWork.WorkAreaId,
};
db.License_RadialWork.InsertOnSubmit(newRadialWork);
db.SubmitChanges();
@@ -408,6 +454,8 @@ namespace BLL
newRadialWork.CloseTime = radialWork.CloseTime;
newRadialWork.NextManId = radialWork.NextManId;
newRadialWork.States = radialWork.States;
newRadialWork.WorkAreaId = radialWork.WorkAreaId;
db.SubmitChanges();
}
}
@@ -476,6 +524,11 @@ namespace BLL
CloseTime = openCircuit.CloseTime,
NextManId = openCircuit.NextManId,
States = openCircuit.States,
WorkAreaId=openCircuit.WorkAreaId,
Reason=openCircuit.Reason,
FireWatchManName=openCircuit.FireWatchManName,
};
db.License_OpenCircuit.InsertOnSubmit(newOpenCircuit);
db.SubmitChanges();
@@ -507,6 +560,10 @@ namespace BLL
newOpenCircuit.CloseTime = openCircuit.CloseTime;
newOpenCircuit.NextManId = openCircuit.NextManId;
newOpenCircuit.States = openCircuit.States;
newOpenCircuit.WorkAreaId = openCircuit.WorkAreaId;
newOpenCircuit.Reason = openCircuit.Reason;
newOpenCircuit.FireWatchManName = openCircuit.FireWatchManName;
db.SubmitChanges();
}
}
@@ -572,6 +629,11 @@ namespace BLL
CloseTime = breakGround.CloseTime,
NextManId = breakGround.NextManId,
States = breakGround.States,
WorkAreaId=breakGround.WorkAreaId,
Reason=breakGround.Reason,
FireWatchManName=breakGround.FireWatchManName,
};
db.License_BreakGround.InsertOnSubmit(newBreakGround);
db.SubmitChanges();
@@ -602,6 +664,10 @@ namespace BLL
newBreakGround.CloseTime = breakGround.CloseTime;
newBreakGround.NextManId = breakGround.NextManId;
newBreakGround.States = breakGround.States;
newBreakGround.WorkAreaId = breakGround.WorkAreaId;
newBreakGround.Reason = breakGround.Reason;
newBreakGround.FireWatchManName = breakGround.FireWatchManName;
db.SubmitChanges();
}
}
@@ -771,6 +837,15 @@ namespace BLL
CloseTime = liftingWork.CloseTime,
NextManId = liftingWork.NextManId,
States = liftingWork.States,
WorkAreaId=liftingWork.WorkAreaId,
LiftingHeight=liftingWork.LiftingHeight,
FireWatchManName=liftingWork.FireWatchManName,
WorkLeaderName=liftingWork.WorkLeaderName,
WorkLeaderTel=liftingWork.WorkLeaderTel,
QzgName=liftingWork.QzgName,
QzgPhone=liftingWork.QzgPhone,
};
db.License_LiftingWork.InsertOnSubmit(newLiftingWork);
db.SubmitChanges();
@@ -802,6 +877,14 @@ namespace BLL
newLiftingWork.CloseTime = liftingWork.CloseTime;
newLiftingWork.NextManId = liftingWork.NextManId;
newLiftingWork.States = liftingWork.States;
newLiftingWork.WorkAreaId = liftingWork.WorkAreaId;
newLiftingWork.LiftingHeight = liftingWork.LiftingHeight;
newLiftingWork.FireWatchManName = liftingWork.FireWatchManName;
newLiftingWork.WorkLeaderName = liftingWork.WorkLeaderName;
newLiftingWork.WorkLeaderTel = liftingWork.WorkLeaderTel;
newLiftingWork.QzgName = liftingWork.QzgName;
newLiftingWork.QzgPhone = liftingWork.QzgPhone;
db.SubmitChanges();
}
}
@@ -828,6 +911,117 @@ namespace BLL
}
#endregion
#region 临时用电作业票
/// <summary>
/// 根据主键获取临时用电作业票
/// </summary>
/// <param name="ElectricityId"></param>
/// <returns></returns>
public static Model.License_Electricity GetElectricityById(string ElectricityId)
{
return Funs.DB.License_Electricity.FirstOrDefault(e => e.ElectricityId == ElectricityId);
}
/// <summary>
/// 添加临时用电作业票
/// </summary>
/// <param name="Electricity"></param>
public static void AddElectricity(Model.License_Electricity Electricity)
{
Model.SGGLDB db = Funs.DB;
Model.License_Electricity newElectricity = new Model.License_Electricity
{
ElectricityId = Electricity.ElectricityId,
ProjectId = Electricity.ProjectId,
LicenseCode = Electricity.LicenseCode,
ApplyUnitId = Electricity.ApplyUnitId,
ApplyManId = Electricity.ApplyManId,
ApplyDate = Electricity.ApplyDate,
WorkPalce = Electricity.WorkPalce,
WorkDepth = Electricity.WorkDepth,
ValidityStartTime = Electricity.ValidityStartTime,
ValidityEndTime = Electricity.ValidityEndTime,
WorkMeasures = Electricity.WorkMeasures,
CancelManId = Electricity.CancelManId,
CancelReasons = Electricity.CancelReasons,
CancelTime = Electricity.CancelTime,
CloseManId = Electricity.CloseManId,
CloseReasons = Electricity.CloseReasons,
CloseTime = Electricity.CloseTime,
NextManId = Electricity.NextManId,
States = Electricity.States,
WorkAreaId= Electricity.WorkAreaId,
Reason = Electricity.Reason,
FireWatchManName = Electricity.FireWatchManName,
WorkLeaderName = Electricity.WorkLeaderName,
WorkLeaderTel = Electricity.WorkLeaderTel,
};
db.License_Electricity.InsertOnSubmit(newElectricity);
db.SubmitChanges();
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectElectricityMenuId, Electricity.ProjectId, Electricity.ApplyUnitId, Electricity.ElectricityId, Electricity.ApplyDate);
}
/// <summary>
/// 修改临时用电作业票
/// </summary>
/// <param name="Electricity"></param>
public static void UpdateElectricity(Model.License_Electricity Electricity)
{
Model.SGGLDB db = Funs.DB;
Model.License_Electricity newElectricity = db.License_Electricity.FirstOrDefault(e => e.ElectricityId == Electricity.ElectricityId);
if (newElectricity != null)
{
newElectricity.WorkPalce = Electricity.WorkPalce;
newElectricity.WorkDepth = Electricity.WorkDepth;
newElectricity.ValidityStartTime = Electricity.ValidityStartTime;
newElectricity.ValidityEndTime = Electricity.ValidityEndTime;
newElectricity.WorkMeasures = Electricity.WorkMeasures;
newElectricity.CancelManId = Electricity.CancelManId;
newElectricity.CancelReasons = Electricity.CancelReasons;
newElectricity.CancelTime = Electricity.CancelTime;
newElectricity.CloseManId = Electricity.CloseManId;
newElectricity.CloseReasons = Electricity.CloseReasons;
newElectricity.CloseTime = Electricity.CloseTime;
newElectricity.NextManId = Electricity.NextManId;
newElectricity.States = Electricity.States;
newElectricity.WorkAreaId = Electricity.WorkAreaId;
newElectricity.Reason = Electricity.Reason;
newElectricity.FireWatchManName = Electricity.FireWatchManName;
newElectricity.WorkLeaderName = Electricity.WorkLeaderName;
newElectricity.WorkLeaderTel = Electricity.WorkLeaderTel;
db.SubmitChanges();
}
}
/// <summary>
/// 根据主键删除临时用电作业票
/// </summary>
/// <param name="ElectricityId"></param>
public static void DeleteElectricityById(string ElectricityId)
{
Model.SGGLDB db = Funs.DB;
Model.License_Electricity Electricity = db.License_Electricity.FirstOrDefault(e => e.ElectricityId == ElectricityId);
if (Electricity != null)
{
///删除编码表记录
CodeRecordsService.DeleteCodeRecordsByDataId(ElectricityId);
////删除附件
CommonService.DeleteAttachFileById(ElectricityId);
///删除-安全措施
DeleteLicenseItemByDataId(ElectricityId);
///删除作业票审核信息
DeleteFlowOperateByDataId(ElectricityId);
db.License_Electricity.DeleteOnSubmit(Electricity);
db.SubmitChanges();
}
}
#endregion
#endregion
#region 作业票-安全措施
SGGL/BLL/HSSE/SitePerson/PersonService.cs
+4 -1
View File
@@ -397,7 +397,10 @@ namespace BLL
/// <returns>HSE人员的数量</returns>
public static int GetHSEPersonCountByUnitId(string unitId, string projectId)
{
var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && (x.WorkPostId == BLL.Const.WorkPost_HSSEEngineer || x.WorkPostId == BLL.Const.WorkPost_SafetyManager) && x.IsUsed == true select x).ToList();
var q = (from x in Funs.DB.SitePerson_Person
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.UnitId == unitId && x.ProjectId == projectId && y.IsHsse==true && x.IsUsed == true select x).ToList();
//var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && (x.WorkPostId == BLL.Const.WorkPost_HSSEEngineer || x.WorkPostId == BLL.Const.WorkPost_SafetyManager) && x.IsUsed == true select x).ToList();
return q.Count();
}