From 944ee634331b14cb06aebce89942c69e02cf6894 Mon Sep 17 00:00:00 2001 From: yhw0507 Date: Wed, 14 Dec 2022 14:55:56 +0800 Subject: [PATCH] =?UTF-8?q?20221214=E9=A1=B9=E7=9B=AE=E5=8A=B3=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BC=98=E5=8C=96=E5=87=BA=E5=85=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=A1=B5=E9=9D=A2=E5=91=88=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2022-12-14.sql | 4 ++ .../0-0系统设置（Menu_SysSet）.sql | 3 ++ .../SitePerson/SitePerson_PersonService.cs | 8 +++ .../Person/ProjectPersonEdit.aspx.cs | 20 ++++++++ SGGL/FineUIPro.Web/Personal/RunLog.aspx | 6 +-- SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs | 8 +-- SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 50 ++++++++----------- SGGL/FineUIPro.Web/common/Menu_HJGL.xml | 2 - SGGL/FineUIPro.Web/common/Menu_HTGL.xml | 2 - SGGL/FineUIPro.Web/common/Menu_PZHGL.xml | 11 ++-- SGGL/FineUIPro.Web/common/Menu_SysSet.xml | 2 +- 11 files changed, 72 insertions(+), 44 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2022-12-14.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-12-14.sql b/DataBase/版本日志/SGGLDB_V2022-12-14.sql new file mode 100644 index 00000000..bc3ddb6c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-12-14.sql @@ -0,0 +1,4 @@ +--־ҳ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('B65A2E1A-5C0B-498A-9F22-365575397A73','־','Personal/RunLog.aspx',70,'C2297533-B7C0-441E-B29F-ADE87C6F8978','Menu_SysSet',1,1,1) +GO \ No newline at end of file diff --git a/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql b/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql index 8ac6d489..fe4c96e9 100644 --- a/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql +++ b/DataBase/菜单初始化脚本/0-0系统设置（Menu_SysSet）.sql @@ -59,6 +59,9 @@ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('E2D59A77-5E9A-4340-8B94-86D04738F907','E4BFDCFD-2B1F-49C5-B02B-1C91BFFAAC6E','',1) GO +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('B65A2E1A-5C0B-498A-9F22-365575397A73','־','Personal/RunLog.aspx',70,'C2297533-B7C0-441E-B29F-ADE87C6F8978','Menu_SysSet',1,1,1) +GO /**********/ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) diff --git a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs index e2bfd37b..79ec6c3c 100644 --- a/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs @@ -766,6 +766,14 @@ namespace BLL } db.SubmitChanges(); + if (!setPersonItemInOut) + { + var getPItem = db.SitePerson_PersonItem.FirstOrDefault(x => x.ProjectId == person.ProjectId && x.IdentityCard == person.IdentityCard); + if (getPItem == null) + { + setPersonItemInOut = true; + } + } if (setPersonItemInOut) { ////现场人员项目出入场记录 diff --git a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs index 0b4279a9..3b53869a 100644 --- a/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/ProjectPersonEdit.aspx.cs @@ -157,6 +157,10 @@ namespace FineUIPro.Web.Person if (person != null) { SetPersonInfo(person); + getInitGridCertificate(); + getInitGridTestRecord(); + getInitGridInOut(); + getInitGridContract(); } else { @@ -178,6 +182,21 @@ namespace FineUIPro.Web.Person this.txtIdentityCard.Readonly = true; } + var getProjectPersom = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.drpProject.SelectedValue,this.PersonId); + if (getProjectPersom != null) + { + this.SitePersonId = getProjectPersom.SitePersonId; + } + else + { + var getProjectPerson = SitePerson_PersonService.GetSitePersonByProjectIdIdentityCard(this.drpProject.SelectedValue, this.txtIdentityCard.Text.Trim()); + if (getProjectPerson != null) + { + this.SitePersonId = getProjectPerson.SitePersonId; + } + } + + #region 基本信息 this.txtPersonName.Text = person.PersonName; this.drpUnit.SelectedValue = person.UnitId; @@ -269,6 +288,7 @@ namespace FineUIPro.Web.Person this.txtRelativeTel.Text = person.RelativeTel; this.txtAddress.Text = person.Address; #endregion + } #endregion diff --git a/SGGL/FineUIPro.Web/Personal/RunLog.aspx b/SGGL/FineUIPro.Web/Personal/RunLog.aspx index 9a4ef469..8b0bd811 100644 --- a/SGGL/FineUIPro.Web/Personal/RunLog.aspx +++ b/SGGL/FineUIPro.Web/Personal/RunLog.aspx @@ -15,7 +15,7 @@ - @@ -42,7 +42,7 @@ - + FieldType="String" HeaderText="操作日志" Width="320px" > diff --git a/SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs b/SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs index ef7e51f8..18e4a721 100644 --- a/SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs +++ b/SGGL/FineUIPro.Web/Personal/RunLog.aspx.cs @@ -27,14 +27,14 @@ namespace FineUIPro.Web.Personal /// private void BindGrid() { - string strSql = @"SELECT sysLog.LogId,sysLog.UserId,sysLog.OperationTime,sysLog.Ip,sysLog.HostName,sysLog.OperationLog,users.UserName,units.UnitName,Project.ProjectId,Project.ProjectName" + string strSql = @"SELECT sysLog.LogId,sysLog.UserId,sysLog.OperationTime,sysLog.Ip,sysLog.HostName,sysLog.OperationLog,users.PersonName,units.UnitName,Project.ProjectId,Project.ProjectName" + @" FROM dbo.Sys_Log as sysLog" - + @" LEFT JOIN Person_Persons as users ON users.UserId=sysLog.UserId " + + @" LEFT JOIN Person_Persons as users ON users.PersonId=sysLog.UserId " + @" LEFT JOIN Base_Unit as units on users.UnitId=units.UnitId" + @" LEFT JOIN Base_Project as Project on sysLog.ProjectId=Project.ProjectId" + @" WHERE sysLog.UserId != '" + Const.hfnbdId + "' AND sysLog.UserId !='" + Const.sedinId + "'"; List listStr = new List(); - if (this.CurrUser.PersonId != BLL.Const.sysglyId) + if (this.CurrUser.PersonId != BLL.Const.sysglyId && this.CurrUser.PersonId != BLL.Const.hfnbdId) { strSql += " AND sysLog.UserId = @UserId"; listStr.Add(new SqlParameter("@UserId", this.CurrUser.PersonId)); @@ -46,7 +46,7 @@ namespace FineUIPro.Web.Personal } if (!string.IsNullOrEmpty(this.txtUser.Text.Trim())) { - strSql += " AND users.UserName LIKE @UserName"; + strSql += " AND users.PersonName LIKE @UserName"; listStr.Add(new SqlParameter("@UserName", "%" + this.txtUser.Text.Trim() + "%")); } if (!string.IsNullOrEmpty(this.txtOperationLog.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml index 72f956cd..c460a9f5 100644 --- a/SGGL/FineUIPro.Web/common/Menu_CQMS.xml +++ b/SGGL/FineUIPro.Web/common/Menu_CQMS.xml @@ -1,15 +1,22 @@  - - + + - - - + + + + + + + + + + @@ -18,43 +25,30 @@ - - + + + + + + + + - - - - - - - - - - - + + - - - - - - - - - - diff --git a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml index 30c699a6..1ea05d70 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HJGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HJGL.xml @@ -4,7 +4,6 @@ - @@ -32,7 +31,6 @@ - diff --git a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml index 2e0976fd..ee18d81b 100644 --- a/SGGL/FineUIPro.Web/common/Menu_HTGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_HTGL.xml @@ -7,6 +7,4 @@ - - \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml b/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml index 15117ad8..e67fa0a1 100644 --- a/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml +++ b/SGGL/FineUIPro.Web/common/Menu_PZHGL.xml @@ -1,15 +1,18 @@  - + - - - + + + + + + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml index 3aea3562..7bb24492 100644 --- a/SGGL/FineUIPro.Web/common/Menu_SysSet.xml +++ b/SGGL/FineUIPro.Web/common/Menu_SysSet.xml @@ -7,11 +7,11 @@ + -