diff --git a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs index 4c74c053..9610f5c5 100644 --- a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanList.aspx.cs @@ -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 { diff --git a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs index a1654ef8..41047be1 100644 --- a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs @@ -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); diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs index 6604eaab..41bb4297 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanList.aspx.cs @@ -368,10 +368,10 @@ namespace FineUIPro.Web.ZHGL.Plan Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning); return; } - + string Id = Grid1.SelectedRowID; 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); return; @@ -635,7 +635,8 @@ namespace FineUIPro.Web.ZHGL.Plan 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 { diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs index aa0bf3f7..f851eb8c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs @@ -587,7 +587,7 @@ namespace FineUIPro.Web.ZHGL.Plan 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); @@ -611,7 +611,7 @@ namespace FineUIPro.Web.ZHGL.Plan { 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);