From 07c1159132a3a83b14227f4cd54565e8bcbea537 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Tue, 4 Jul 2023 15:07:59 +0800 Subject: [PATCH 1/3] 2023-07-04 --- SGGL/FineUIPro.Web/index.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/index.aspx.cs b/SGGL/FineUIPro.Web/index.aspx.cs index 33838690..183f41eb 100644 --- a/SGGL/FineUIPro.Web/index.aspx.cs +++ b/SGGL/FineUIPro.Web/index.aspx.cs @@ -309,7 +309,7 @@ namespace FineUIPro.Web this.MenuSwitchMethod(Request.Params["menuType"]); } - this.MenuSwitchMethod(Request.Params["menuType"]); + // this.MenuSwitchMethod(Request.Params["menuType"]); this.InitMenuStyleButton(); this.InitMenuModeButton(); this.InitLangMenuButton(); From 96825ce0465c8f29309eaf2e73876c2f5e7c7643 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 4 Jul 2023 15:21:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E6=96=BD?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs index 4048cc96..42878ac1 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Plan/ActionPlanListEdit.aspx.cs @@ -100,10 +100,10 @@ namespace FineUIPro.Web.ZHGL.Plan { HFActionPlanListId.Text = this.ActionPlanListId; this.ProjectId = actionPlanList.ProjectId; - if (this.ProjectId != this.CurrUser.LoginProjectId) - { - BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, true); - } + //if (this.ProjectId != this.CurrUser.LoginProjectId) + //{ + // BLL.Person_PersonsService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpCompileMan, this.ProjectId, null, null, false); + //} if (actionPlanList.Edition != null) { txtEdition.Text = actionPlanList.Edition.ToString(); From 2acaf7721bff9afad1844304b44f28716b56e154 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 4 Jul 2023 16:30:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-07-04.sql | 46 ++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 DataBase/版本日志/SGGLDB_V2023-07-04.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-07-04.sql b/DataBase/版本日志/SGGLDB_V2023-07-04.sql new file mode 100644 index 00000000..28a0e04f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-07-04.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 and ApproveDate is null +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 + +