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-13 08:31:05 +08:00
parent de3763f245
commit 2a4772c921
28 changed files with 1874 additions and 3916 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APILicenseDataService.cs
+88 -54
View File
@@ -62,7 +62,8 @@ namespace BLL
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireLevel = x.FireLevel
FireLevel = x.FireLevel,
SignatureUrl=x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -109,6 +110,7 @@ namespace BLL
FireWatchManName = x.FireWatchManName,
WorkLeaderName = x.WorkLeaderName,
WorkLeaderTel = x.WorkLeaderTel,
SignatureUrl = x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -157,6 +159,7 @@ namespace BLL
TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
TestPerson = x.TestPerson,
VenStep = x.VenStep,
SignatureUrl = x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -203,6 +206,7 @@ namespace BLL
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
SignatureUrl = x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -246,6 +250,7 @@ namespace BLL
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
SignatureUrl = x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -288,6 +293,7 @@ namespace BLL
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
SignatureUrl = x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -330,6 +336,7 @@ namespace BLL
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.NightWorkId).AttachUrl.Replace('\\', '/'),
States = x.States,
OldLicenseId = x.OldLicenseId,
SignatureUrl = x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -377,6 +384,9 @@ namespace BLL
WorkLeaderTel = x.WorkLeaderTel,
QzgName = x.QzgName,
QzgPhone = x.QzgPhone,
SignatureUrl = x.SignatureUrl,
SjPhone=x.SjPhone,
SjName=x.SjName
}).FirstOrDefault();
}
#endregion
@@ -421,7 +431,8 @@ namespace BLL
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel
WorkLeaderTel=x.WorkLeaderTel,
SignatureUrl = x.SignatureUrl
}).FirstOrDefault();
}
#endregion
@@ -513,7 +524,8 @@ namespace BLL
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason=x.Reason,
FireLevel=x.FireLevel
FireLevel=x.FireLevel,
SignatureUrl = x.SignatureUrl
}).ToList();
}
#endregion
@@ -558,6 +570,7 @@ namespace BLL
FireWatchManName=x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel,
SignatureUrl = x.SignatureUrl
}).ToList();
}
@@ -605,7 +618,7 @@ namespace BLL
TestDate= string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
TestPerson=x.TestPerson,
VenStep=x.VenStep,
SignatureUrl = x.SignatureUrl
@@ -655,7 +668,7 @@ namespace BLL
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
SignatureUrl = x.SignatureUrl
}).ToList();
}
#endregion
@@ -697,7 +710,7 @@ namespace BLL
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason=x.Reason,
FireWatchManName=x.FireWatchManName,
SignatureUrl = x.SignatureUrl
}).ToList();
}
#endregion
@@ -738,7 +751,7 @@ namespace BLL
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason=x.Reason,
FireWatchManName=x.FireWatchManName,
SignatureUrl = x.SignatureUrl
}).ToList();
}
#endregion
@@ -781,6 +794,7 @@ namespace BLL
NextManId = x.NextManId,
NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName,
States = x.States,
SignatureUrl = x.SignatureUrl
}).ToList();
}
#endregion
@@ -828,7 +842,7 @@ namespace BLL
WorkLeaderTel=x.WorkLeaderTel,
QzgName=x.QzgName,
QzgPhone=x.QzgPhone,
SignatureUrl = x.SignatureUrl
}).ToList();
}
#endregion
@@ -872,7 +886,7 @@ namespace BLL
FireWatchManName = x.FireWatchManName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel=x.WorkLeaderTel,
SignatureUrl = x.SignatureUrl
}).ToList();
}
#endregion
@@ -952,7 +966,7 @@ namespace BLL
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireLevel = x.FireLevel
FireLevel = x.FireLevel,
}).ToList();
if (getFireWork.Count() > 0)
{
@@ -1378,7 +1392,8 @@ namespace BLL
WorkAreaId=newItem.WorkAreaId,
Reason=newItem.Reason,
FireLevel=newItem.FireLevel
FireLevel=newItem.FireLevel,
SignatureUrl = newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
@@ -1433,6 +1448,7 @@ namespace BLL
updateFireWork.WorkAreaId = newItem.WorkAreaId;
updateFireWork.Reason = newItem.Reason;
updateFireWork.FireLevel = newItem.FireLevel;
updateFireWork.SignatureUrl = newItem.SignatureUrl;
}
updateFireWork.States = newFireWork.States;
}
@@ -1470,7 +1486,7 @@ namespace BLL
FireWatchManName=newItem.FireWatchManName,
WorkLeaderName=newItem.WorkLeaderName,
WorkLeaderTel=newItem.WorkLeaderTel,
SignatureUrl = newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
@@ -1528,6 +1544,7 @@ namespace BLL
updateHeightWork.FireWatchManName = newItem.FireWatchManName;
updateHeightWork.WorkLeaderName = newItem.WorkLeaderName;
updateHeightWork.WorkLeaderTel = newItem.WorkLeaderTel;
updateHeightWork.SignatureUrl = newItem.SignatureUrl;
}
updateHeightWork.States = newHeightWork.States;
}
@@ -1565,7 +1582,8 @@ namespace BLL
TestResult=newItem.TestResult,
TestDate= Funs.GetNewDateTime(newItem.TestDate),
TestPerson=newItem.TestPerson,
VenStep=newItem.VenStep
VenStep=newItem.VenStep,
SignatureUrl=newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
{
@@ -1616,13 +1634,14 @@ namespace BLL
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.LimitedDescribe = newLimitedSpace.LimitedDescribe;
updateLimitedSpace.IsBoolOther = newLimitedSpace.IsBoolOther;
updateLimitedSpace.IsBoolHarmfulGas = newLimitedSpace.IsBoolHarmfulGas;
updateLimitedSpace.TestResult = newLimitedSpace.TestResult;
updateLimitedSpace.TestDate = Funs.GetNewDateTime(newItem.TestDate);
updateLimitedSpace.TestPerson = newItem.TestPerson;
updateLimitedSpace.VenStep = newItem.VenStep;
updateLimitedSpace.TestPerson = newLimitedSpace.TestPerson;
updateLimitedSpace.VenStep = newLimitedSpace.VenStep;
updateLimitedSpace.SignatureUrl = newLimitedSpace.SignatureUrl;
}
updateLimitedSpace.States = newLimitedSpace.States;
}
@@ -1657,7 +1676,8 @@ namespace BLL
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId
WorkAreaId = newItem.WorkAreaId,
SignatureUrl = newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
{
@@ -1710,7 +1730,8 @@ namespace BLL
updateRadialWork.WatchManContact = newRadialWork.WatchManContact;
updateRadialWork.NextManId = newRadialWork.NextManId;
updateRadialWork.States = newRadialWork.States;
updateRadialWork.WorkAreaId = newItem.WorkAreaId;
updateRadialWork.WorkAreaId = newRadialWork.WorkAreaId;
updateRadialWork.SignatureUrl = newRadialWork.SignatureUrl;
}
updateRadialWork.States = newRadialWork.States;
}
@@ -1742,9 +1763,10 @@ namespace BLL
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId,
Reason=newItem.Reason,
FireWatchManName=newItem.FireWatchManName,
WorkAreaId = newItem.WorkAreaId,
Reason = newItem.Reason,
FireWatchManName = newItem.FireWatchManName,
SignatureUrl = newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
@@ -1796,9 +1818,10 @@ namespace BLL
updateOpenCircuit.NextManId = newOpenCircuit.NextManId;
updateOpenCircuit.States = newOpenCircuit.States;
updateOpenCircuit.WorkAreaId = newItem.WorkAreaId;
updateOpenCircuit.Reason = newItem.Reason;
updateOpenCircuit.FireWatchManName = newItem.FireWatchManName;
updateOpenCircuit.WorkAreaId = newOpenCircuit.WorkAreaId;
updateOpenCircuit.Reason = newOpenCircuit.Reason;
updateOpenCircuit.FireWatchManName = newOpenCircuit.FireWatchManName;
updateOpenCircuit.SignatureUrl = newOpenCircuit.SignatureUrl;
}
updateOpenCircuit.States = newOpenCircuit.States;
}
@@ -1829,9 +1852,10 @@ namespace BLL
NextManId = newItem.NextManId,
States = newItem.States,
WorkAreaId=newItem.WorkAreaId,
Reason=newItem.Reason,
FireWatchManName=newItem.FireWatchManName
WorkAreaId = newItem.WorkAreaId,
Reason = newItem.Reason,
FireWatchManName = newItem.FireWatchManName,
SignatureUrl = newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
{
@@ -1881,9 +1905,10 @@ namespace BLL
updateBreakGround.NextManId = newBreakGround.NextManId;
updateBreakGround.States = newBreakGround.States;
updateBreakGround.WorkAreaId = newItem.WorkAreaId;
updateBreakGround.Reason = newItem.Reason;
updateBreakGround.FireWatchManName = newItem.FireWatchManName;
updateBreakGround.WorkAreaId = newBreakGround.WorkAreaId;
updateBreakGround.Reason = newBreakGround.Reason;
updateBreakGround.FireWatchManName = newBreakGround.FireWatchManName;
updateBreakGround.SignatureUrl = newBreakGround.SignatureUrl;
}
updateBreakGround.States = newBreakGround.States;
}
@@ -1916,6 +1941,7 @@ namespace BLL
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
NextManId = newItem.NextManId,
States = newItem.States,
SignatureUrl = newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
{
@@ -1967,6 +1993,7 @@ namespace BLL
updateNightWork.SafeLeaderTel = newItem.SafeLeaderTel;
updateNightWork.NextManId = newNightWork.NextManId;
updateNightWork.States = newNightWork.States;
updateNightWork.SignatureUrl = newItem.SignatureUrl;
}
updateNightWork.States = newNightWork.States;
}
@@ -1998,13 +2025,16 @@ namespace BLL
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,
WorkAreaId = newItem.WorkAreaId,
LiftingHeight = newItem.LiftingHeight,
FireWatchManName = newItem.FireWatchManName,
WorkLeaderName = newItem.WorkLeaderName,
WorkLeaderTel = newItem.WorkLeaderTel,
QzgName = newItem.QzgName,
QzgPhone = newItem.QzgPhone,
SignatureUrl = newItem.SignatureUrl,
SjName=newItem.SjName,
SjPhone=newItem.SjPhone
};
if (newItem.States == Const.State_0)
@@ -2056,13 +2086,16 @@ namespace BLL
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.WorkAreaId = newLiftingWork.WorkAreaId;
updateLiftingWork.LiftingHeight = newLiftingWork.LiftingHeight;
updateLiftingWork.FireWatchManName = newLiftingWork.FireWatchManName;
updateLiftingWork.WorkLeaderName = newLiftingWork.WorkLeaderName;
updateLiftingWork.WorkLeaderTel = newLiftingWork.WorkLeaderTel;
updateLiftingWork.QzgName = newLiftingWork.QzgName;
updateLiftingWork.QzgPhone = newLiftingWork.QzgPhone;
updateLiftingWork.SignatureUrl = newLiftingWork.SignatureUrl;
updateLiftingWork.SjName = newLiftingWork.SjName;
updateLiftingWork.SjPhone = newLiftingWork.SjPhone;
}
updateLiftingWork.States = newLiftingWork.States;
}
@@ -2098,7 +2131,8 @@ namespace BLL
Reason = newItem.Reason,
FireWatchManName = newItem.FireWatchManName,
WorkLeaderName= newItem.WorkLeaderName,
WorkLeaderTel = newItem.WorkLeaderTel
WorkLeaderTel = newItem.WorkLeaderTel,
SignatureUrl=newItem.SignatureUrl
};
if (newItem.States == Const.State_0)
{
@@ -2148,12 +2182,12 @@ namespace BLL
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.WorkAreaId = newElectricity.WorkAreaId;
updateElectricity.Reason = newElectricity.Reason;
updateElectricity.FireWatchManName = newElectricity.FireWatchManName;
updateElectricity.WorkLeaderName = newElectricity.WorkLeaderName;
updateElectricity.WorkLeaderTel = newElectricity.WorkLeaderTel;
updateElectricity.SignatureUrl = newElectricity.SignatureUrl;
}
updateElectricity.States = newElectricity.States;