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

修改作业许可接口

This commit is contained in:
高飞 2023-09-13 14:52:39 +08:00
parent 2a4772c921
commit b17e1900e2
5 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataBase/版本日志/SGGLDB_WH_2023-09-12.sql
View File

@ -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;

7
SGGL/BLL/API/HSSE/APILicenseDataService.cs
View File

@ -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();
}

6
SGGL/Model/APIItem/HSSE/FlowOperateItem.cs
View File

@ -170,5 +170,11 @@ namespace Model
get;
set;
}
public string AttachUrl
{
get;
set;
}
}
}

24
SGGL/Model/Model.cs
View File

@ -209297,6 +209297,8 @@ namespace Model
private System.Nullable<int> _OrderNum;
private string _SignatureUrl;
private EntityRef<Sys_User> _Sys_User;
private EntitySet<License_FlowOperateItem> _License_FlowOperateItem;
@ -209335,6 +209337,8 @@ namespace Model
partial void OnGroupNumChanged();
partial void OnOrderNumChanging(System.Nullable<int> 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
{

2
SGGL/WebAPI/Controllers/HSSE/LicenseController.cs
View File

@ -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)
{