From 7cca1b3cd34041302c4e1ec06c097f835a874463 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 13 Sep 2023 20:42:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SGGLDB_WH_2023-09-13.sql | 6 +++ SGGL/BLL/API/HSSE/APILicenseDataService.cs | 23 +++++++-- .../File/Word/HSSE/动火作业票.doc | Bin 46592 -> 31744 bytes .../HSSE/License/FireWork.aspx.cs | 24 +++++++++ .../HSSE/License/HeightWork.aspx.cs | 4 +- .../HSSE/License/LimitedSpaceView.aspx | 38 +++++++------- .../License/LimitedSpaceView.aspx.designer.cs | 18 +++---- SGGL/Model/Model.cs | 48 ++++++++++++++++++ 8 files changed, 128 insertions(+), 33 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_WH_2023-09-13.sql diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-13.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-13.sql new file mode 100644 index 00000000..f89f55ae --- /dev/null +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-13.sql @@ -0,0 +1,6 @@ +--߱ͼ໤ֶ + ALTER TABLE License_RadialWork +ADD WorkLeaderName nvarchar(50) null; + + ALTER TABLE License_RadialWork +ADD FireWatchManName nvarchar(50) null; \ No newline at end of file diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index f7d54dbc..431a9686 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -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; diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc index 774bd6af91143e2569f1dbaee83da0d84c75d1be..d010ded167cc09b228f8f9ec3988901b85988c9e 100644 GIT binary patch literal 31744 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 diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs index 0164a33a..c0a67319 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs @@ -667,6 +667,30 @@ namespace FineUIPro.Web.HSSE.License } } + var item13 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 13); + if (item13 != null) + { + if (item13.IsUsed == true) + { + Bookmark bookmarkUser13 = doc.Range.Bookmarks["User13"];//确认执行 + if (bookmarkUser13 != null) + { + bookmarkUser13.Text = "√"; + } + } + else + { + Bookmark bookmarkIsFit13 = doc.Range.Bookmarks["IsFit13"]; + if (bookmarkIsFit13 != null) + { + if (item13 != null) + { + bookmarkIsFit13.Text = "×"; + } + } + } + } + } //审核记录 diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs index 959c7cb3..4bafa43b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWork.aspx.cs @@ -345,7 +345,7 @@ namespace FineUIPro.Web.HSSE.License Bookmark bookmarkWorkType = doc.Range.Bookmarks["WorkType"];//作业类别 if (bookmarkWorkType != null) { - if (getHeightWork != null) + if (getHeightWork.WorkType != null) { bookmarkWorkType.Text = getHeightWork.WorkType; @@ -380,7 +380,7 @@ namespace FineUIPro.Web.HSSE.License Bookmark bookmarkEquipmentTools = doc.Range.Bookmarks["EquipmentTools"];//设备及工具 if (bookmarkEquipmentTools != null) { - if (getHeightWork != null) + if (getHeightWork.EquipmentTools != null) { bookmarkEquipmentTools.Text = getHeightWork.EquipmentTools; diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx index 4f956f95..00ecf1a3 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx @@ -21,72 +21,76 @@ - + - + - + - + - + - + - + - + - - - + - + + - + - + - + - + + + + + + + - protected global::FineUIPro.TextBox txtIsBoolOther; - /// - /// txtIsBoolHarmfulGas 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtIsBoolHarmfulGas; - /// /// txtTestResult 控件。 /// @@ -167,6 +158,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtVenStep; + /// + /// txtIsBoolHarmfulGas 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtIsBoolHarmfulGas; + /// /// Grid1 控件。 /// diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index ddb3e5f3..a3d83c74 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -216095,6 +216095,10 @@ namespace Model private string _SignatureUrl; + private string _WorkLeaderName; + + private string _FireWatchManName; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -216165,6 +216169,10 @@ namespace Model partial void OnWorkAreaIdChanged(); partial void OnSignatureUrlChanging(string value); partial void OnSignatureUrlChanged(); + partial void OnWorkLeaderNameChanging(string value); + partial void OnWorkLeaderNameChanged(); + partial void OnFireWatchManNameChanging(string value); + partial void OnFireWatchManNameChanged(); #endregion public License_RadialWork() @@ -216727,6 +216735,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderName", DbType="NVarChar(50)")] + public string WorkLeaderName + { + get + { + return this._WorkLeaderName; + } + set + { + if ((this._WorkLeaderName != value)) + { + this.OnWorkLeaderNameChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderName = value; + this.SendPropertyChanged("WorkLeaderName"); + this.OnWorkLeaderNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FireWatchManName", DbType="NVarChar(50)")] + public string FireWatchManName + { + get + { + return this._FireWatchManName; + } + set + { + if ((this._FireWatchManName != value)) + { + this.OnFireWatchManNameChanging(value); + this.SendPropertyChanging(); + this._FireWatchManName = value; + this.SendPropertyChanged("FireWatchManName"); + this.OnFireWatchManNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_RadialWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project {