修改实施计划
This commit is contained in:
parent
c51a1380d7
commit
de20531bc4
|
|
@ -473,8 +473,8 @@ namespace FineUIPro.Web.HSSE.ActionPlan
|
|||
actionPlanList.States = actionPlanList1.States;
|
||||
}
|
||||
|
||||
if (!CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
|
||||
{
|
||||
//if (!CurrUser.PersonId.Equals(actionPlanList1.CompileMan))
|
||||
//{
|
||||
Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetConstructSoluAppByApproveMan(ActionPlanListId, CurrUser.PersonId, Convert.ToInt32(actionPlanList1.Edition));
|
||||
if (type == BLL.Const.BtnSubmit)
|
||||
{
|
||||
|
|
@ -484,30 +484,30 @@ namespace FineUIPro.Web.HSSE.ActionPlan
|
|||
approve.IsAgree = Convert.ToBoolean(rblIsAgree.SelectedValue);
|
||||
approve.ApproveIdea = txtOptions.Text.Trim();
|
||||
ActionPlanListApproveService.UpdateActionPlanListApprove(approve);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (type == BLL.Const.BtnSubmit)
|
||||
{
|
||||
if (actionPlanList1.States == Const.ActionPlanList_Audit)//==会签状态升级版本
|
||||
{
|
||||
Model.ActionPlan_ActionPlanListApprove reApprove = new Model.ActionPlan_ActionPlanListApprove();
|
||||
reApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
|
||||
reApprove.ApproveDate = DateTime.Now;
|
||||
reApprove.ApproveMan = actionPlanList1.CompileMan;
|
||||
reApprove.ApproveType = Const.ActionPlanList_ReCompile;
|
||||
edtion++;
|
||||
reApprove.Edition = edtion;
|
||||
ActionPlanListApproveService.AddActionPlanListApprove(reApprove);
|
||||
}
|
||||
else
|
||||
{
|
||||
Model.ActionPlan_ActionPlanListApprove approves = ActionPlanListApproveService.GetConstructSolApproveByApproveMan(ActionPlanListId, actionPlanList1.CompileMan);
|
||||
approves.ApproveDate = DateTime.Now;
|
||||
ActionPlanListApproveService.UpdateActionPlanListApprove(approves);
|
||||
}
|
||||
}
|
||||
}
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// if (type == BLL.Const.BtnSubmit)
|
||||
// {
|
||||
// if (actionPlanList1.States == Const.ActionPlanList_Audit)//==会签状态升级版本
|
||||
// {
|
||||
// Model.ActionPlan_ActionPlanListApprove reApprove = new Model.ActionPlan_ActionPlanListApprove();
|
||||
// reApprove.ActionPlanListId = actionPlanList.ActionPlanListId;
|
||||
// reApprove.ApproveDate = DateTime.Now;
|
||||
// reApprove.ApproveMan = actionPlanList1.CompileMan;
|
||||
// reApprove.ApproveType = Const.ActionPlanList_ReCompile;
|
||||
// edtion++;
|
||||
// reApprove.Edition = edtion;
|
||||
// ActionPlanListApproveService.AddActionPlanListApprove(reApprove);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// Model.ActionPlan_ActionPlanListApprove approves = ActionPlanListApproveService.GetConstructSolApproveByApproveMan(ActionPlanListId, actionPlanList1.CompileMan);
|
||||
// approves.ApproveDate = DateTime.Now;
|
||||
// ActionPlanListApproveService.UpdateActionPlanListApprove(approves);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue