diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql index ae05b46e..1b359d50 100644 --- a/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql +++ b/DataBase/版本日志/SGGLDB_WH_2023-09-12.sql @@ -32,3 +32,5 @@ ADD SignatureUrl nvarchar(500) null; ALTER TABLE License_NightWork ADD SignatureUrl nvarchar(500) null; +ALTER TABLE License_FlowOperate +ADD SignatureUrl nvarchar(500) null; \ No newline at end of file diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index 791344d5..f7d54dbc 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -1332,6 +1332,8 @@ namespace BLL IsAgree = x.IsAgree, Opinion = x.Opinion, IsFlowEnd = x.IsFlowEnd ?? false, + SignatureUrl = x.SignatureUrl, + AttachUrl = AttachFileService.getFileUrl(x.FlowOperateId) }).ToList(); return getInfoList; @@ -2333,7 +2335,7 @@ namespace BLL updateFlowOperate.IsAgree = newItem.IsAgree; updateFlowOperate.Opinion = newItem.Opinion; updateFlowOperate.IsClosed = true; - + updateFlowOperate.SignatureUrl = newItem.SignatureUrl; db.SubmitChanges(); /////增加一条审核明细记录 @@ -2777,7 +2779,8 @@ namespace BLL IsAgree = x.IsAgree, Opinion = x.Opinion, IsFlowEnd = x.IsFlowEnd ?? false, - SignatureUrl = db.Sys_User.First(y => y.UserId == x.OperaterId).SignatureUrl.Replace('\\', '/'), + SignatureUrl = x.SignatureUrl.Replace('\\', '/'), + AttachUrl = AttachFileService.getFileUrl(x.FlowOperateId) }; return getFlowOperate.FirstOrDefault(); } diff --git a/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs b/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs index a13643a9..87a80195 100644 --- a/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs +++ b/SGGL/Model/APIItem/HSSE/FlowOperateItem.cs @@ -170,5 +170,11 @@ namespace Model get; set; } + + public string AttachUrl + { + get; + set; + } } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 18e05fd5..ddb3e5f3 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -209297,6 +209297,8 @@ namespace Model private System.Nullable _OrderNum; + private string _SignatureUrl; + private EntityRef _Sys_User; private EntitySet _License_FlowOperateItem; @@ -209335,6 +209337,8 @@ namespace Model partial void OnGroupNumChanged(); partial void OnOrderNumChanging(System.Nullable value); partial void OnOrderNumChanged(); + partial void OnSignatureUrlChanging(string value); + partial void OnSignatureUrlChanged(); #endregion public License_FlowOperate() @@ -209648,6 +209652,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignatureUrl", DbType="NVarChar(500)")] + public string SignatureUrl + { + get + { + return this._SignatureUrl; + } + set + { + if ((this._SignatureUrl != value)) + { + this.OnSignatureUrlChanging(value); + this.SendPropertyChanging(); + this._SignatureUrl = value; + this.SendPropertyChanged("SignatureUrl"); + this.OnSignatureUrlChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_FlowOperate_Sys_User", Storage="_Sys_User", ThisKey="OperaterId", OtherKey="UserId", IsForeignKey=true)] public Sys_User Sys_User { diff --git a/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs b/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs index 4f31fa11..2fad1d1d 100644 --- a/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/LicenseController.cs @@ -5,6 +5,7 @@ using System.Net; using System.Net.Http; using System.Web.Http; using BLL; +using Mvc.Controllers; namespace WebAPI.Controllers { @@ -191,6 +192,7 @@ namespace WebAPI.Controllers try { APILicenseDataService.SaveLicenseFlowOperate(flowOperateItem); + CheckListController.SaveAttachFile(flowOperateItem.FlowOperateId, BLL.Const.CheckListMenuId, flowOperateItem.AttachUrl); } catch (Exception ex) {