lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改实施计划导出

Browse Source
This commit is contained in:
高飞
2023-07-26 17:47:39 +08:00
parent 738bdd8e3e
commit 803b559e7e
2 changed files with 132 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs
+15 -1
View File
@@ -702,6 +702,8 @@ namespace FineUIPro.Web.HSSE.ActionPlan
builder.EndRow(); builder.EndRow();
} }
foreach (var item in ActionPlan_ActionPlanListApproveList2) foreach (var item in ActionPlan_ActionPlanListApproveList2)
{
if (item.ApproveMan != "905a75d6-e733-449f-9742-4dcd71e8d2e1" && item.DepartId != BLL.Const.Depart_CompanyLeaderId)
{ {
//部门名称 //部门名称
builder.InsertCell(); builder.InsertCell();
@@ -762,6 +764,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
} }
builder.EndRow(); builder.EndRow();
} }
}
#endregion #endregion
} }
#region 最后2行审核 #region 最后2行审核
@@ -783,6 +786,13 @@ namespace FineUIPro.Web.HSSE.ActionPlan
builder.CellFormat.Width = 300; builder.CellFormat.Width = 300;
builder.Font.Bold = true; builder.Font.Bold = true;
builder.RowFormat.Height = 40; builder.RowFormat.Height = 40;
var AQApprove = (from x in db.ActionPlan_ActionPlanListApprove
where x.ApproveMan == "905a75d6-e733-449f-9742-4dcd71e8d2e1"
select x).FirstOrDefault();
if (AQApprove != null)
{
builder.Write(AQApprove.ApproveIdea + "\n\n");
}
builder.Write("公司安全总监/部门负责人:"); builder.Write("公司安全总监/部门负责人:");
var personAQ = BLL.Person_PersonsService.GetPerson_PersonsById("905a75d6-e733-449f-9742-4dcd71e8d2e1"); //安全总监任学宁 var personAQ = BLL.Person_PersonsService.GetPerson_PersonsById("905a75d6-e733-449f-9742-4dcd71e8d2e1"); //安全总监任学宁
if (!string.IsNullOrEmpty(personAQ.SignatureUrl) && File.Exists(rootPath + personAQ.SignatureUrl)) if (!string.IsNullOrEmpty(personAQ.SignatureUrl) && File.Exists(rootPath + personAQ.SignatureUrl))
@@ -817,13 +827,17 @@ namespace FineUIPro.Web.HSSE.ActionPlan
builder.CellFormat.Width = 300; builder.CellFormat.Width = 300;
builder.Font.Bold = true; builder.Font.Bold = true;
builder.RowFormat.Height = 40; builder.RowFormat.Height = 40;
builder.Write("公司主管生产/安全领导:");
var GSLDApprove = (from x in db.ActionPlan_ActionPlanListApprove var GSLDApprove = (from x in db.ActionPlan_ActionPlanListApprove
join y in db.Person_Persons join y in db.Person_Persons
on x.ApproveMan equals y.PersonId on x.ApproveMan equals y.PersonId
where x.ActionPlanListId == Id && x.DepartId == BLL.Const.Depart_CompanyLeaderId where x.ActionPlanListId == Id && x.DepartId == BLL.Const.Depart_CompanyLeaderId
select x).FirstOrDefault(); select x).FirstOrDefault();
if (GSLDApprove != null) if (GSLDApprove != null)
{
builder.Write(GSLDApprove.ApproveIdea + "\n\n");
}
builder.Write("公司主管生产/安全领导:");
if (GSLDApprove != null)
{ {
var personGSLD = BLL.Person_PersonsService.GetPerson_PersonsById(GSLDApprove.ApproveMan); var personGSLD = BLL.Person_PersonsService.GetPerson_PersonsById(GSLDApprove.ApproveMan);
if (!string.IsNullOrEmpty(personGSLD.SignatureUrl) && File.Exists(rootPath + personGSLD.SignatureUrl)) if (!string.IsNullOrEmpty(personGSLD.SignatureUrl) && File.Exists(rootPath + personGSLD.SignatureUrl))
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs
+15 -1
View File
@@ -684,6 +684,8 @@ namespace FineUIPro.Web.ZHGL.Plan
builder.EndRow(); builder.EndRow();
} }
foreach (var item in ActionPlan_ActionPlanListApproveList2) foreach (var item in ActionPlan_ActionPlanListApproveList2)
{
if (item.ApproveMan != "905a75d6-e733-449f-9742-4dcd71e8d2e1" && item.DepartId != BLL.Const.Depart_CompanyLeaderId)
{ {
//部门名称 //部门名称
builder.InsertCell(); builder.InsertCell();
@@ -744,6 +746,7 @@ namespace FineUIPro.Web.ZHGL.Plan
} }
builder.EndRow(); builder.EndRow();
} }
}
#endregion #endregion
} }
#region 最后2行审核 #region 最后2行审核
@@ -765,6 +768,13 @@ namespace FineUIPro.Web.ZHGL.Plan
builder.CellFormat.Width = 300; builder.CellFormat.Width = 300;
builder.Font.Bold = true; builder.Font.Bold = true;
builder.RowFormat.Height = 40; builder.RowFormat.Height = 40;
var AQApprove = (from x in db.ActionPlan_ActionPlanListApprove
where x.ApproveMan == "905a75d6-e733-449f-9742-4dcd71e8d2e1"
select x).FirstOrDefault();
if (AQApprove != null)
{
builder.Write(AQApprove.ApproveIdea + "\n\n");
}
builder.Write("公司安全总监/部门负责人:"); builder.Write("公司安全总监/部门负责人:");
var personAQ = BLL.Person_PersonsService.GetPerson_PersonsById("905a75d6-e733-449f-9742-4dcd71e8d2e1"); //安全总监任学宁 var personAQ = BLL.Person_PersonsService.GetPerson_PersonsById("905a75d6-e733-449f-9742-4dcd71e8d2e1"); //安全总监任学宁
if (!string.IsNullOrEmpty(personAQ.SignatureUrl) && File.Exists(rootPath + personAQ.SignatureUrl)) if (!string.IsNullOrEmpty(personAQ.SignatureUrl) && File.Exists(rootPath + personAQ.SignatureUrl))
@@ -799,13 +809,17 @@ namespace FineUIPro.Web.ZHGL.Plan
builder.CellFormat.Width = 300; builder.CellFormat.Width = 300;
builder.Font.Bold = true; builder.Font.Bold = true;
builder.RowFormat.Height = 40; builder.RowFormat.Height = 40;
builder.Write("公司主管生产/安全领导:");
var GSLDApprove = (from x in db.ActionPlan_ActionPlanListApprove var GSLDApprove = (from x in db.ActionPlan_ActionPlanListApprove
join y in db.Person_Persons join y in db.Person_Persons
on x.ApproveMan equals y.PersonId on x.ApproveMan equals y.PersonId
where x.ActionPlanListId == Id && x.DepartId == BLL.Const.Depart_CompanyLeaderId where x.ActionPlanListId == Id && x.DepartId == BLL.Const.Depart_CompanyLeaderId
select x).FirstOrDefault(); select x).FirstOrDefault();
if (GSLDApprove != null) if (GSLDApprove != null)
{
builder.Write(GSLDApprove.ApproveIdea + "\n\n");
}
builder.Write("公司主管生产/安全领导:");
if (GSLDApprove != null)
{ {
var personGSLD = BLL.Person_PersonsService.GetPerson_PersonsById(GSLDApprove.ApproveMan); var personGSLD = BLL.Person_PersonsService.GetPerson_PersonsById(GSLDApprove.ApproveMan);
if (!string.IsNullOrEmpty(personGSLD.SignatureUrl) && File.Exists(rootPath + personGSLD.SignatureUrl)) if (!string.IsNullOrEmpty(personGSLD.SignatureUrl) && File.Exists(rootPath + personGSLD.SignatureUrl))