修改实施计划导出

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
@@ -649,7 +649,8 @@ namespace FineUIPro.Web.HSSE.ActionPlan
builder.Font.Bold = false;
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
{
@@ -590,7 +590,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
approve1.ApproveDate = DateTime.Now;
approve1.ApproveMan = this.CurrUser.PersonId;
approve1.ApproveMan = this.drpCompileMan.SelectedValue;
approve1.ApproveType = Const.ActionPlanList_Compile;
approve1.Edition = Convert.ToInt32(txtEdition.Text);
ActionPlanListApproveService.AddActionPlanListApprove(approve1);
@@ -599,7 +599,7 @@ namespace FineUIPro.Web.HSSE.ActionPlan
{
Model.ActionPlan_ActionPlanListApprove approve1 = new Model.ActionPlan_ActionPlanListApprove();
approve1.ActionPlanListId = actionPlanList.ActionPlanListId;
approve1.ApproveMan = this.CurrUser.PersonId;
approve1.ApproveMan = this.drpCompileMan.SelectedValue;
approve1.ApproveType = Const.ActionPlanList_Compile;
approve1.Edition = Convert.ToInt32(txtEdition.Text);
ActionPlanListApproveService.AddActionPlanListApprove(approve1);