Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

2024-07-17 14:44:26 +08:00
parent 1cb6714d67 b503c6f706
commit 91eb8f4b50
46 changed files with 1379 additions and 385 deletions
@@ -0,0 +1,77 @@
+ALTER VIEW [dbo].[View_Hazard_HazardRegister]
+AS
+SELECT Registration.HazardRegisterId, 
+	Registration.HazardCode, 
+	Registration.RegisterDate, 
+	Registration.RegisterDef, 
+	Registration.Rectification, 
+	Registration.Place, 
+	Registration.ResponsibleUnit, 
+	Registration.Observer, 
+	Registration.Risk_Level,
+	Registration.RectifiedDate, 
+	Registration.ProjectId, 
+	Project.UnitId AS PUnitId,
+	ProjectUnit.UnitName AS PUnitName,
+	Registration.states,
+	Registration.IsEffective,
+	Registration.ResponsibleMan,
+	Registration.CheckManId,
+	Registration.CheckTime,
+	Registration.RectificationPeriod,
+	Registration.ImageUrl,
+	Registration.RectificationImageUrl,
+	Registration.RectificationTime,
+	Registration.ConfirmMan,
+	Registration.ConfirmDate,
+	Registration.HandleIdea, 
+	Registration.CutPayment, 
+	Registration.ProblemTypes, 
+	Registration.CheckSpecialId,
+	Registration.CheckItemDetailId,
+	Registration.SupCheckItemSetId,
+	Registration.CheckItemSetId,
+	Registration.SafeSupervisionId,
+	Registration.SafeSupervisionIsOK,
+	Project.ProjectName,
+	Registration.CheckCycle,
+	ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
+	Unit.UnitName  as ResponsibilityUnitName,
+	User1.UserName AS ResponsibilityManName,
+	ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
+	User2.UserName AS CheckManName,
+	ISNULL(User2.Telephone,'') AS  CheckManTel,
+	User2.UnitId AS SendUnitId,
+	User3.UserName AS ConfirmManName,
+	ISNULL(User3.Telephone,'') AS  ConfirmManTel,
+	User4.UserName AS ResponsibilityManName2,
+	ISNULL(User4.Telephone,'') AS  ResponsibilityMan2Tel,
+	(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '´ýÕû¸Ä' 
+	WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ºÏ¸ñ' 
+	WHEN Registration.states='2' THEN 'ÒÑÕû¸Ä-´ý¸´²éÑéÊÕ' 
+	WHEN Registration.states='3' THEN 'ÒÑ±Õ»·' 
+	ELSE 'ÒÑ×÷·Ï' END ) AS StatesStr,
+	RegisterTypes.RegisterTypesId,
+	RegisterTypes.RegisterTypesName,
+	Registration.DIC_ID,
+	Registration.CCManIds,
+	CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
+				    where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
+					ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
+					FOR XML PATH('')), 1, 1,''),
+	Registration.Requirements,
+	Registration.Type,
+	Registration.HiddenType
+FROM dbo.HSSE_Hazard_HazardRegister AS Registration
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
+LEFT JOIN dbo.Base_Unit AS ProjectUnit ON Project.UnitId = ProjectUnit.UnitId
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place 
+LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId 
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
+LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan   
+LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
+LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan
+LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
+
+
+GO
@@ -0,0 +1,51 @@
+--hse巡检增加隐患类型
+alter table HSSE_Hazard_HazardRegister
+add HiddenType nvarchar(50) NULL;
+
+--专项检查增加隐患类型
+alter table Check_CheckSpecialDetail
+add HiddenType nvarchar(50) NULL;
+
+--综合检查增加隐患类型和级别
+alter table Check_CheckColligationDetail
+add HiddenHazardType nvarchar(50) NULL;
+
+alter table Check_CheckColligationDetail
+add HiddenType nvarchar(50) NULL;
+
+--隐患整改单增加隐患类型和级别
+alter table Check_RectifyNoticesItem
+add HiddenType nvarchar(50) NULL;
+
+alter table Check_RectifyNoticesItem
+add HiddenHazardType nvarchar(50) NULL;
+
+
+
+--增加隐患类型
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'高处坠落','高处坠落',1,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'物体打击','物体打击',2,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'车辆伤害','车辆伤害',3,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'机械伤害','机械伤害',4,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'起重伤害','起重伤害',5,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'触电','触电',6,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'火灾','火灾',7,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'灼烫','灼烫',8,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'坍塌','坍塌',9,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'淹溺','淹溺',10,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'爆炸','爆炸',11,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'中毒窒息','中毒窒息',12,'Hiddendangertype')
+insert into Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
+values(newid(),'环境损害','环境损害',13,'Hiddendangertype')
@@ -0,0 +1,42 @@
+ALTER VIEW [dbo].[View_Check_CheckColligationDetail]  AS 
+/*综合大检查明细列表视图*/
+SELECT checkColligationDetail.CheckColligationDetailId, 
+checkColligationDetail.CheckColligationId, 
+checkColligationDetail.CheckItem, 
+checkColligationDetail.CheckItemType,
+checkColligationDetail.Unqualified,
+checkColligationDetail.CheckArea,
+checkColligationDetail.UnitId,
+checkColligationDetail.HandleStep,
+checkColligationDetail.CompleteStatus,
+(CASE WHEN checkColligationDetail.CompleteStatus =1 THEN '是' 
+			WHEN checkColligationDetail.CompleteStatus =0 THEN '否' ELSE '' END) AS  CompleteStatusName,
+checkColligationDetail.LimitedDate,
+checkColligationDetail.CompletedDate,
+checkColligationDetail.Suggestions,
+checkColligationDetail.CheckContent,
+CASE WHEN checkColligationDetail.CheckContent IS NOT NULL THEN checkColligationDetail.CheckContent
+ELSE checkItemSet.CheckItemName END AS CheckItemStr,
+checkColligationDetail.WorkArea,
+unit.UnitName,
+const.ConstText AS HandleStepStr,
+checkColligationDetail.HiddenDangerType,
+checkColligationDetail.HiddenDangerLevel,
+person.UserName AS PersonName,
+
+checkColligationDetail.HiddenType,
+checkColligationDetail.HiddenHazardType
+
+FROM dbo.Check_CheckColligationDetail AS checkColligationDetail
+--LEFT JOIN dbo.Check_ProjectCheckItemDetail AS checkItemDetail ON checkItemDetail.CheckItemDetailId=checkColligationDetail.CheckItem
+LEFT JOIN dbo.Technique_CheckItemSet AS checkItemSet ON checkItemSet.CheckItemSetId=checkColligationDetail.CheckItem
+LEFT JOIN dbo.Base_Unit AS unit ON unit.UnitId=checkColligationDetail.UnitId
+LEFT JOIN dbo.Sys_User AS person ON person.UserId = checkColligationDetail.PersonId
+LEFT JOIN Sys_Const AS const ON const.ConstValue = checkColligationDetail.HandleStep AND const.GroupId='HandleStep'
+
+GO
+
+
+insert into Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+values('5DC49905-6A1C-4353-A06C-D9D1A8D6B6F9','隐患排查与治理统计','HSSE/Check/HiddenTroubleManager.aspx',130,'467A0CB9-737D-4451-965E-869EBC3A4BD6','Menu_HSSE',0,1,1)
+go