From de20531bc489c4f89f73f9ab41d8ee013ebd9786 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Fri, 14 Jul 2023 22:18:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E6=96=BD=E8=AE=A1?= =?UTF-8?q?=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ActionPlan/ActionPlanListEdit.aspx.cs | 52 +++++++++---------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs index 41047be1..4d73a32d 100644 --- a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs @@ -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 {