diff --git a/DataBase/版本日志/SGGLDB_V2023-07-03.sql b/DataBase/版本日志/SGGLDB_V2023-07-03.sql new file mode 100644 index 00000000..71b93aac --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-07-03.sql @@ -0,0 +1,46 @@ + + +--ȡǰĿ +ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems] + @projectId NVARCHAR(50)=NULL, + @personId NVARCHAR(200)=NULL +AS +/*ȡǰ˱*/ +BEGIN +SELECT CostManageId AS DataId + ,'HSE' AS MenuName + ,('HSE'+ CONVERT(varchar(100),CostManage.CostManageDate, 23)+'') AS Content + ,PersonId + ,persons.PersonName + ,CostManage.CostManageDate AS DataTime + ,CONVERT(varchar(100),CostManage.CostManageDate, 23) AS DataTimeStr + ,(CASE WHEN CostManage.States = '0' THEN '../HSSE/CostGoods/CostManageEdit.aspx?CostManageId='+CostManageId + ELSE '../HSSE/CostGoods/CostManageAudit.aspx?CostManageId='+CostManageId END)AS PCUrl +FROM CostGoods_CostManage AS CostManage +LEFT JOIN Person_Persons AS persons ON CostManage.NextManId= persons.PersonId +WHERE CostManage.ProjectId=@projectId AND (CostManage.States = '0' or CostManage.States='1' ) + AND CostManage.NextManId =@personId + +UNION ALL +SELECT ActionPlan.ActionPlanListId AS DataId + ,'ȫʵʩƻ' AS MenuName + ,('ȫʵʩƻ'+ CONVERT(varchar(100),ActionPlan.CompileDate, 23)+'')+'' AS Content + ,approve.ApproveMan AS PersonId + ,persons.PersonName + ,CompileDate AS DataTime + ,CONVERT(varchar(100),CompileDate, 23) AS DataTimeStr + ,'../HSSE/ActionPlan/ActionPlanListEdit.aspx?ActionPlanListId='+ActionPlan.ActionPlanListId AS PCUrl +FROM ActionPlan_ActionPlanList AS ActionPlan +LEFT JOIN ActionPlan_ActionPlanListApprove as approve on ActionPlan.ActionPlanListId=approve.ActionPlanListId and ApproveType!='S' and approve.ApproveMan=@personId +LEFT JOIN Person_Persons AS persons ON persons.PersonId =approve.ApproveMan +WHERE ActionPlan.ProjectId=@projectId and ActionPlan.ActionPlanListId in (select ActionPlanListId from dbo.ActionPlan_ActionPlanListApprove + where PersonId=@PersonId and ApproveDate is null and ApproveType!='S') + + + +ORDER BY DataTime DESC +END + +GO + + diff --git a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs index 9083b3c7..a1654ef8 100644 --- a/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/ActionPlan/ActionPlanListEdit.aspx.cs @@ -171,26 +171,26 @@ namespace FineUIPro.Web.HSSE.ActionPlan Panel2.Enabled = false; } //提交版本人多次修改 - if (actionPlanList.CompileMan.Equals(CurrUser.PersonId)) - { - txtActionPlanListCode.Enabled = true; - txtActionPlanListName.Enabled = true; - txtVersionNo.Enabled = true; - drpProjectType.Enabled = true; - drpCompileMan.Enabled = true; - txtCompileDate.Enabled = true; - ContactImg = 0; - Panel2.Enabled = true; - Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId); - if (approve == null) - { - rblIsAgree.Hidden = true; - rblIsAgree.Required = false; - options.Hidden = true; - txtOptions.Required = false; - optio.Hidden = true; - } - } + //if (actionPlanList.CompileMan.Equals(CurrUser.PersonId)) + //{ + // txtActionPlanListCode.Enabled = true; + // txtActionPlanListName.Enabled = true; + // txtVersionNo.Enabled = true; + // drpProjectType.Enabled = true; + // drpCompileMan.Enabled = true; + // txtCompileDate.Enabled = true; + // ContactImg = 0; + // Panel2.Enabled = true; + // Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId); + // if (approve == null) + // { + // rblIsAgree.Hidden = true; + // rblIsAgree.Required = false; + // options.Hidden = true; + // txtOptions.Required = false; + // optio.Hidden = true; + // } + //} } WindowAtt_Close(null, null); } @@ -514,15 +514,15 @@ namespace FineUIPro.Web.HSSE.ActionPlan actionPlanList.States = actionPlanList1.States; } //提交时候，更新提交版本 - if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan)) - { - if (actionPlanList1.States != Const.ActionPlanList_Audit) - { - edtion++; - } - actionPlanList.Edition = Convert.ToInt32(edtion); - actionPlanList.States = Const.ActionPlanList_Audit; - } + //if (CurrUser.PersonId.Equals(actionPlanList1.CompileMan)) + //{ + // if (actionPlanList1.States != Const.ActionPlanList_Audit) + // { + // edtion++; + // } + // actionPlanList.Edition = Convert.ToInt32(edtion); + // actionPlanList.States = Const.ActionPlanList_Audit; + //} BLL.ActionPlanListService.UpdateActionPlanList(actionPlanList); //判断状态，全部会签同意，则审批完成 if (type == BLL.Const.BtnSubmit) diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs index 74a5237c..7a23966e 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs @@ -228,25 +228,25 @@ namespace FineUIPro.Web.ZHGL.Plan this.gvDepart.EnableRowDoubleClickEvent = false; } //提交版本人多次修改 - if (actionPlanList.CompileMan.Equals(CurrUser.PersonId)) - { - txtActionPlanListCode.Enabled = true; - txtActionPlanListName.Enabled = true; - txtVersionNo.Enabled = true; - drpProjectType.Enabled = true; - drpCompileMan.Enabled = true; - txtCompileDate.Enabled = true; - ContactImg = 0; - Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId); - if (approve == null) - { - rblIsAgree.Hidden = true; - rblIsAgree.Required = false; - options.Hidden = true; - txtOptions.Required = false; - optio.Hidden = true; - } - } + //if (actionPlanList.CompileMan.Equals(CurrUser.PersonId)) + //{ + // txtActionPlanListCode.Enabled = true; + // txtActionPlanListName.Enabled = true; + // txtVersionNo.Enabled = true; + // drpProjectType.Enabled = true; + // drpCompileMan.Enabled = true; + // txtCompileDate.Enabled = true; + // ContactImg = 0; + // Model.ActionPlan_ActionPlanListApprove approve = ActionPlanListApproveService.GetActionPlanListApproveByApproveMan(ActionPlanListId, CurrUser.PersonId); + // if (approve == null) + // { + // rblIsAgree.Hidden = true; + // rblIsAgree.Required = false; + // options.Hidden = true; + // txtOptions.Required = false; + // optio.Hidden = true; + // } + //} } WindowAtt_Close(null, null); }