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-07 15:31:52 +08:00
parent ab6b89f8ee
commit 09a616d801
4 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs
+2 -1
View File
@@ -649,7 +649,8 @@ namespace FineUIPro.Web.HSSE.ActionPlan
builder.Font.Bold = false; builder.Font.Bold = false;
if (item.ApproveDate != null) if (item.ApproveDate != null)
{ {
builder.Write(item.ApproveDate.ToString().Split(' ')[0]); string personName = Person_PersonsService.GetPersonsNameById(item.ApproveMan);
builder.Write(personName + " " + item.ApproveDate.ToString().Split(' ')[0]);
} }
else else
{ {
SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs
+2 -2
View File
@@ -590,7 +590,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove(); Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
approve1.ActionPlanListId = actionPlanList.ActionPlanListId; approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
approve1.ApproveDate = DateTime.Now; approve1.ApproveDate = DateTime.Now;
approve1.ApproveMan = this.CurrUser.PersonId; approve1.ApproveMan = this.drpCompileMan.SelectedValue;
approve1.ApproveType = Const.ActionPlanList_Compile; approve1.ApproveType = Const.ActionPlanList_Compile;
approve1.Edition = Convert.ToInt32(txtEdition.Text); approve1.Edition = Convert.ToInt32(txtEdition.Text);
ActionPlanListApproveService.AddActionPlanListApprove(approve1); ActionPlanListApproveService.AddActionPlanListApprove(approve1);
@@ -599,7 +599,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
{ {
Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove(); Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
approve1.ActionPlanListId = actionPlanList.ActionPlanListId; approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
approve1.ApproveMan = this.CurrUser.PersonId; approve1.ApproveMan = this.drpCompileMan.SelectedValue;
approve1.ApproveType = Const.ActionPlanList_Compile; approve1.ApproveType = Const.ActionPlanList_Compile;
approve1.Edition = Convert.ToInt32(txtEdition.Text); approve1.Edition = Convert.ToInt32(txtEdition.Text);
ActionPlanListApproveService.AddActionPlanListApprove(approve1); ActionPlanListApproveService.AddActionPlanListApprove(approve1);
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs
+4 -3
View File
@@ -368,10 +368,10 @@ namespace FineUIPro.Web.ZHGL.Plan
Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning); Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
return; return;
} }
string Id = Grid1.SelectedRowID; string Id = Grid1.SelectedRowID;
Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(Id); Model.ActionPlan_ActionPlanList actionPlanList = BLL.ActionPlanListService.GetActionPlanListById(Id);
if (actionPlanList.States!=BLL.Const.ActionPlanList_Complete) if (actionPlanList.States != BLL.Const.ActionPlanList_Complete)
{ {
Alert.ShowInTop("状态必须为审批完成的才能导出！", MessageBoxIcon.Warning); Alert.ShowInTop("状态必须为审批完成的才能导出！", MessageBoxIcon.Warning);
return; return;
@@ -635,7 +635,8 @@ namespace FineUIPro.Web.ZHGL.Plan
builder.Font.Bold = false; builder.Font.Bold = false;
if (item.ApproveDate != null) if (item.ApproveDate != null)
{ {
builder.Write(item.ApproveDate.ToString().Split(' ')[0]); string personName = Person_PersonsService.GetPersonsNameById(item.ApproveMan);
builder.Write(personName + " " + item.ApproveDate.ToString().Split(' ')[0]);
} }
else else
{ {
SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs
+2 -2
View File
@@ -587,7 +587,7 @@ namespace FineUIPro.Web.ZHGL.Plan
Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove(); Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
approve1.ActionPlanListId = actionPlanList.ActionPlanListId; approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
approve1.ApproveDate = DateTime.Now; approve1.ApproveDate = DateTime.Now;
approve1.ApproveMan = this.CurrUser.PersonId; approve1.ApproveMan = this.drpCompileMan.SelectedValue;
approve1.ApproveType = Const.ActionPlanList_Compile; approve1.ApproveType = Const.ActionPlanList_Compile;
approve1.Edition = Convert.ToInt32(txtEdition.Text); approve1.Edition = Convert.ToInt32(txtEdition.Text);
ActionPlanListApproveService.AddActionPlanListApprove(approve1); ActionPlanListApproveService.AddActionPlanListApprove(approve1);
@@ -611,7 +611,7 @@ namespace FineUIPro.Web.ZHGL.Plan
{ {
Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove(); Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
approve1.ActionPlanListId = actionPlanList.ActionPlanListId; approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
approve1.ApproveMan = this.CurrUser.PersonId; approve1.ApproveMan = this.drpCompileMan.SelectedValue;
approve1.ApproveType = Const.ActionPlanList_Compile; approve1.ApproveType = Const.ActionPlanList_Compile;
approve1.Edition = Convert.ToInt32(txtEdition.Text); approve1.Edition = Convert.ToInt32(txtEdition.Text);
ActionPlanListApproveService.AddActionPlanListApprove(approve1); ActionPlanListApproveService.AddActionPlanListApprove(approve1);