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 20:42:47 +08:00
parent b17e1900e2
commit 7cca1b3cd3
8 changed files with 128 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/API/HSSE/APILicenseDataService.cs
+18 -5
View File
@@ -181,14 +181,18 @@ namespace BLL
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
RadialType = x.RadialType,
WorkLeaderId = x.WorkLeaderId,
WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
//负责人
// WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel = x.WorkLeaderTel,
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
WorkPalce = x.WorkPalce,
WorkMeasures = x.WorkMeasures,
FireWatchManId = x.FireWatchManId,
FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
//监护人
// FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
FireWatchManName=x.FireWatchManName,
WatchManContact = x.WatchManContact,
CancelManId = x.CancelManId,
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
@@ -290,6 +294,7 @@ namespace BLL
OldLicenseId = x.OldLicenseId,
WorkAreaId = x.WorkAreaId,
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
Reason = x.Reason,
FireWatchManName = x.FireWatchManName,
@@ -645,14 +650,16 @@ namespace BLL
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
RadialType = x.RadialType,
WorkLeaderId = x.WorkLeaderId,
WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
//WorkLeaderName = db.Sys_User.First(u => u.UserId == x.WorkLeaderId).UserName,
WorkLeaderName=x.WorkLeaderName,
WorkLeaderTel = x.WorkLeaderTel,
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
WorkPalce = x.WorkPalce,
WorkMeasures = x.WorkMeasures,
FireWatchManId = x.FireWatchManId,
FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
//FireWatchManName = db.Sys_User.First(u => u.UserId == x.FireWatchManId).UserName,
FireWatchManName=x.FireWatchManName,
WatchManContact = x.WatchManContact,
CancelManId = x.CancelManId,
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
@@ -1578,7 +1585,8 @@ namespace BLL
NextManId = newItem.NextManId,
States = newItem.States,
LimitedDescribe=newItem.LimitedDescribe,
WorkAreaId=newItem.WorkAreaId,
LimitedDescribe =newItem.LimitedDescribe,
IsBoolOther=newItem.IsBoolOther,
IsBoolHarmfulGas=newItem.IsBoolHarmfulGas,
TestResult=newItem.TestResult,
@@ -1636,6 +1644,7 @@ namespace BLL
updateLimitedSpace.NextManId = newLimitedSpace.NextManId;
updateLimitedSpace.States = newLimitedSpace.States;
updateLimitedSpace.WorkAreaId = newLimitedSpace.WorkAreaId;
updateLimitedSpace.LimitedDescribe = newLimitedSpace.LimitedDescribe;
updateLimitedSpace.IsBoolOther = newLimitedSpace.IsBoolOther;
updateLimitedSpace.IsBoolHarmfulGas = newLimitedSpace.IsBoolHarmfulGas;
@@ -1662,12 +1671,14 @@ namespace BLL
ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate),
RadialType = newItem.RadialType,
WorkLeaderId = newItem.WorkLeaderId,
WorkLeaderName = newItem.WorkLeaderName,
WorkLeaderTel = newItem.WorkLeaderTel,
ValidityStartTime = Funs.GetNewDateTime(newItem.ValidityStartTime),
ValidityEndTime = Funs.GetNewDateTime(newItem.ValidityEndTime),
WorkPalce = newItem.WorkPalce,
WorkMeasures = newItem.WorkMeasures,
FireWatchManId = newItem.FireWatchManId,
FireWatchManName=newItem.FireWatchManName,
WatchManContact = newItem.WatchManContact,
CancelManId = newItem.CancelManId,
CancelReasons = newItem.CancelReasons,
@@ -1723,12 +1734,14 @@ namespace BLL
{
updateRadialWork.RadialType = newRadialWork.RadialType;
updateRadialWork.WorkLeaderId = newRadialWork.WorkLeaderId;
updateRadialWork.WorkLeaderName = newRadialWork.WorkLeaderName;
updateRadialWork.WorkLeaderTel = newRadialWork.WorkLeaderTel;
updateRadialWork.ValidityStartTime = newRadialWork.ValidityStartTime;
updateRadialWork.ValidityEndTime = newRadialWork.ValidityEndTime;
updateRadialWork.WorkPalce = newRadialWork.WorkPalce;
updateRadialWork.WorkMeasures = newRadialWork.WorkMeasures;
updateRadialWork.FireWatchManId = newRadialWork.FireWatchManId;
updateRadialWork.FireWatchManName = newRadialWork.FireWatchManName;
updateRadialWork.WatchManContact = newRadialWork.WatchManContact;
updateRadialWork.NextManId = newRadialWork.NextManId;
updateRadialWork.States = newRadialWork.States;