diff --git a/DataBase/2023-01-04升级/1.SitePerson_Person.sql b/DataBase/2023-01-04升级/1.SitePerson_Person.sql new file mode 100644 index 00000000..caf7573e --- /dev/null +++ b/DataBase/2023-01-04升级/1.SitePerson_Person.sql @@ -0,0 +1,13 @@ + drop INDEX IX_SitePerson_Person ON [dbo].[SitePerson_Person] + +alter table [dbo].[SitePerson_Person] +alter column IsUsed [int] NULL + + +CREATE NONCLUSTERED INDEX [IX_SitePerson_Person] ON [dbo].[SitePerson_Person] +( + [ProjectId] ASC, + [UnitId] ASC, + [IsUsed] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +GO \ No newline at end of file diff --git a/DataBase/2023-01-04升级/2.View_Law_RulesRegulations.sql b/DataBase/2023-01-04升级/2.View_Law_RulesRegulations.sql new file mode 100644 index 00000000..b78b91da --- /dev/null +++ b/DataBase/2023-01-04升级/2.View_Law_RulesRegulations.sql @@ -0,0 +1,30 @@ + + + +ALTER VIEW [dbo].[View_Law_RulesRegulations] +as +select + R.RulesRegulationsId, + R.RulesRegulationsCode, + R.RulesRegulationsName, + R.RulesRegulationsTypeId, + R.CustomDate, + R.ApplicableScope, + R.Remark, + R.AttachUrl, + R.CompileMan, + R.CompileDate, + R.IsPass, + R.UnitId, + R.IsBuild, + T.RulesRegulationsTypeCode AS RulesRegulationsTypeCode, + T.RulesRegulationsTypeName AS RulesRegulationsTypeName, + Substring(R.AttachUrl,charindex('~',R.AttachUrl)+1,LEN(R.AttachUrl)) as AttachUrlName, + (CASE WHEN IsBuild = 1 THEN '' ELSE '˾' END ) AS IsBuildName +FROM dbo.Law_RulesRegulations AS R +LEFT JOIN dbo.Base_RulesRegulationsType AS T ON T.RulesRegulationsTypeId=R.RulesRegulationsTypeId + + +GO + + diff --git a/DataBase/2023-01-04升级/3.View_SitePerson_Person.sql b/DataBase/2023-01-04升级/3.View_SitePerson_Person.sql new file mode 100644 index 00000000..1dd60f6d --- /dev/null +++ b/DataBase/2023-01-04升级/3.View_SitePerson_Person.sql @@ -0,0 +1,108 @@ + + +/****** Object: View [dbo].[View_SitePerson_Person] Script Date: 2022/12/20 9:34:16 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + +ALTER VIEW [dbo].[View_SitePerson_Person] +AS +SELECT Person.PersonId, + Person.CardNo, + Person.PersonName, + Person.Sex, + (Case Person.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, + Person.IdentityCard, + Person.Address, + Person.ProjectId, + Person.UnitId, + Person.Birthday, + Person.TeamGroupId, + Person.WorkAreaId, + Person.WorkPostId, + Person.InTime, + Person.OutTime, + Person.OutResult, + Person.Telephone, + Person.PositionId, + Person.PostTitleId, + Person.PhotoUrl, + Person.IsUsed, + (CASE Person.IsUsed WHEN 1 THEN 'ڸ' WHEN 0 THEN '' ELSE '' END) AS IsUsedName, + Person.IsCardUsed, + (CASE Person.IsCardUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsCardUsedName, + Person.PersonIndex, + Project.ProjectCode, + Project.ProjectName, + Unit.UnitCode, + Unit.UnitName, + TeamGroup.TeamGroupName, + --WorkArea.UnitWorkCode AS WorkAreaCode, + WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + --WorkArea.UnitWorkName AS WorkAreaName + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + Post.WorkPostName, + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + Post.PostType, + Post.IsHsse, + (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T WHERE T.PersonId=Person.PersonId) AS TrainCount, + Person.AuditorId, + sysUser.UserName AS AuditorName, + Person.AuditorDate, + Person.IDCardUrl, + Person.IsForeign, + case when Person.IsForeign=1 then '' else '' end as IsForeignStr, + Person.IdcardType, + BasicData1.dictName as IdcardTypeName, + Person.IdcardStartDate, + Person.IdcardEndDate, + Person.IdcardForever, + case when Person.IdcardForever='Y' then '' else '' end as IdcardForeverStr, + Person.PoliticsStatus, + BasicData2.dictName as PoliticsStatusName, + Person.IdcardAddress, + Person.Nation, + BasicData3.dictName as NationName, + Person.EduLevel, + BasicData4.dictName as EduLevelName, + Person.MaritalStatus, + BasicData5.dictName as MaritalStatusName, + Person.CountryCode, + Country.cname as CountryName, + Person.ProvinceCode, + City.cname as ProvinceName, + Person.MainCNProfessionalId, + CNProfessional.ProfessionalName as MainCNProfessionalName, + Person.ViceCNProfessionalId, + '' as ViceCNProfessionalName, + Person.IsOutside, + case when Person.IsOutside=1 then '' else '' end as IsOutsideStr +FROM SitePerson_Person AS Person +LEFT JOIN Base_Project AS Project ON Project.ProjectId=Person.ProjectId +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId +--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId +LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId +Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId +Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId +Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId +Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType +Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus +Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation +Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel +Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus +Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode +Left JOIN RealName_City AS City ON City.provinceCode = Person.ProvinceCode +Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId + + + +GO + + diff --git a/DataBase/2023-01-04升级/4.Sys_Menu_2023-1-3.txt b/DataBase/2023-01-04升级/4.Sys_Menu_2023-1-3.txt new file mode 100644 index 00000000..4646b3ca --- /dev/null +++ b/DataBase/2023-01-04升级/4.Sys_Menu_2023-1-3.txt @@ -0,0 +1 @@ +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'3C009AA9-B44F-4000-BC77-BF02C4E83785', N'HSSE管理月报(项目汇总)', NULL, N'ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx', '20', N'70E51ABF-81C8-49CB-89AC-CF0542A201D6', N'Menu_ZHGL', '1', '1', '1'); diff --git a/DataBase/Sys_Menu_2023-1-3.txt b/DataBase/Sys_Menu_2023-1-3.txt new file mode 100644 index 00000000..4646b3ca --- /dev/null +++ b/DataBase/Sys_Menu_2023-1-3.txt @@ -0,0 +1 @@ +INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES (N'3C009AA9-B44F-4000-BC77-BF02C4E83785', N'HSSE管理月报(项目汇总)', NULL, N'ZHGL/ManagementReport/HSSEMonthReportProjectSum.aspx', '20', N'70E51ABF-81C8-49CB-89AC-CF0542A201D6', N'Menu_ZHGL', '1', '1', '1'); diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx b/SGGL/FineUIPro.Web/common/mainProject.aspx index 54ed0670..14b2d694 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx @@ -32,7 +32,7 @@
安全检查
-
+
0
@@ -408,6 +408,11 @@