lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

统一人员资质上传功能，优化风险分级动态管控功能，优化安全管理页面看板

Browse Source
This commit is contained in:
潘鸿锋
2024-07-04 14:01:20 +08:00
parent b1b3bd291c
commit cc3b5d045d
40 changed files with 4801 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataBase/版本日志/SGGLDB_WH_2024-7-1-01phf.sql
+98
View File
@@ -0,0 +1,98 @@
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 'TRUE' 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,
Person.HeadImage,
RealNameAddTime,
Person.IsBlacklist
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 AND Country.CountryId=City.countryId
Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId
GO
DataBase/版本日志/SGGLDB_WH_2024-7-1-phf.sql
+8
View File
@@ -0,0 +1,8 @@
--藤속붚츰데
ALTER TABLE siteperson_person
ADD IsBlacklist bit NULL;
--藤속붚츰데꽉데
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('06A96829-08BF-4314-896A-81579039F82D','붚츰데','HSSE/SitePerson/BlackPersonList.aspx',11,'EE260447-028F-46AF-8864-9A5DC9DAA5BD','Menu_HSSE',0,1,1)
go
DataBase/版本日志/SGGLDB_WH_2024-7-2-phf.sql
+35
View File
@@ -0,0 +1,35 @@
INSERT INTO Base_RiskLevel(RiskLevelId,RiskLevel,RiskLevelName,MinValue,MaxValue,ControlMeasures,Days)
values('dc123980-732c-4fdc-a08e-7d03ebd4388e','5','五级','0','0','五级','1');
--删除菜单“HSE费用▷ ▷ HSE费用计划；HSE费用支出；分包商HSE费用申请”。
update sys_menu set IsUsed=0 where menuname='HSE费用计划';
update sys_menu set IsUsed=0 where menuname='HSE费用支出';
update sys_menu set IsUsed=0 where menuname='分包商HSE费用申请';
--合同HSE费用额登记
insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
values('C6CF3A5C-546B-483A-B742-A77F2E152523','合同HSE费用额登记','HSSE/CostGoods/FeeRegistration.aspx',9,'20ECB69E-28C4-4FAC-941A-15F446AEB634','Menu_HSSE',0,1,1)
go
insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
values('8CC1F1E8-3CB4-4213-A88D-EFDDA3E2272B','C6CF3A5C-546B-483A-B742-A77F2E152523','增加',1)
insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
values('DF601450-8F0A-427A-9BB4-30E9D3A6123A','C6CF3A5C-546B-483A-B742-A77F2E152523','修改',2)
insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
values('CE006C1E-476F-4D3C-8B28-4114B5CD360F','C6CF3A5C-546B-483A-B742-A77F2E152523','删除',3)
insert into Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
values('10C0B8CF-B32B-4D11-AACA-972D085015BB','C6CF3A5C-546B-483A-B742-A77F2E152523','保存',4)
go
CREATE TABLE [dbo].[CostGoods_FeeRegistration](
[Id] [nvarchar](50) NOT NULL,
[ProjectId] [nvarchar](50) NULL,
[UnitId] [nvarchar](50) NULL,
[Cost] [decimal](18, 2) NULL,
[CompileDate] [datetime] NULL,
[CompileMan] [nvarchar](50) NULL,
CONSTRAINT [PK_CostGoods_FeeRegistration] PRIMARY KEY CLUSTERED
(
[Id] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO
DataBase/版本日志/SGGLDB_WH_2024-7-4-phf.sql
+30
View File
@@ -0,0 +1,30 @@
--HSSE/CostGoods/PayRegistration.aspx
update SYS_MENU set URL='HSSE/CostGoods/PayRegistrationNew.aspx' where menuid='9EFF1A0F-87AA-43E7-83B0-79EEAAC8848E';
--HSSE/CostGoods/CostLedger.aspx
update SYS_MENU set URL='HSSE/CostGoods/CostLedgerNew.aspx' where menuid='19C1370F-92C0-4E31-87B4-8BADA74113E4';
CREATE TABLE [dbo].[CostGoods_HseExpense](
[Id] [nvarchar](50) NOT NULL,
[ProjectId] [nvarchar](50) NULL,
[UnitId] [nvarchar](50) NULL,
[PayDate] [datetime] NULL,
[PayMonth] [nvarchar](50) NULL,
[SMonthType1] [decimal](18, 2) NULL,
[SMonthType2] [decimal](18, 2) NULL,
[SMonthType3] [decimal](18, 2) NULL,
[SMonthType4] [decimal](18, 2) NULL,
[SMonthType5] [decimal](18, 2) NULL,
[SMonthType6] [decimal](18, 2) NULL,
[SMonthType7] [decimal](18, 2) NULL,
[SMonthType8] [decimal](18, 2) NULL,
[SMonthType9] [decimal](18, 2) NULL,
[SMonthType10] [decimal](18, 2) NULL,
[CompileMan] [nvarchar](50) NULL,
[CompileDate] [datetime] NULL,
CONSTRAINT [PK_CostGoods_HseExpense] PRIMARY KEY CLUSTERED
(
[Id] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO