Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

2023-09-01 15:30:03 +08:00
parent 773cd0e1b7 9a8290752e
commit dcc72edcb3
49 changed files with 1575 additions and 338 deletions
@@ -0,0 +1,82 @@
+
+
+ALTER TABLE Solution_LargerHazardListItem ALTER COLUMN WorkPackageId NVARCHAR(2000) NULL
+GO
+ALTER TABLE Solution_LargerHazardListItem ADD WorkPackageName NVARCHAR(2000) NULL
+GO
+
+ALTER TABLE Check_SpotCheckDetail ADD WorkPackageId NVARCHAR(2000) NULL
+GO
+
+ALTER TABLE Accident_AccidentPersonRecord ADD WorkPackageId NVARCHAR(2000) NULL
+GO
+ALTER TABLE Accident_AccidentPersonRecord ADD WorkPackageName NVARCHAR(2000) NULL
+GO
+
+
+ALTER VIEW [dbo].[View_Solution_LargerHazardListItem] 
+ AS 
+/*危大工程清单明细列表视图*/
+SELECT Project.ProjectCode
+	,ISNULL(Project.ShortName,Project.ProjectName) AS ProjectName
+	,Project.ProjectId
+	,list.HazardCode
+	,list.RecordTime
+	,list.RecardManId
+	,list.Remark
+	,list.States
+	,list.VersionNo
+	,Item.LargerHazardListItemId
+    ,Item.SortIndex
+    ,Item.LargerHazardListId
+    ,Item.UnitWorkId
+	,(UnitWork.UnitWorkName+'('+(CASE WHEN UnitWork.ProjectType='1' THEN '建筑' ELSE '安装' END)+')') AS UnitWorkName 
+    ,Item.WorkPackageId
+	,WorkPackageName AS PackageContent
+    ,Item.WorkPackageSize
+    ,Item.ExpectedStartTime
+    ,Item.ExpectedEndTime
+    ,Item.IsArgument
+	,(CASE WHEN Item.IsArgument=1 THEN '是' ELSE '否' END) AS IsArgumentName
+	,Item.WorkStates
+	,constw.ConstText AS WorkStatesName
+    ,Item.UnitId
+	,Unit.UnitName
+	,((CASE WHEN Item.ExpectedStartTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedStartTime,23) END)  
+	+ '至'+ (CASE WHEN Item.ExpectedEndTime IS NULL THEN '' ELSE CONVERT(varchar(100), Item.ExpectedEndTime,23) END)) AS ExpectedTime
+FROM dbo.Solution_LargerHazardListItem AS Item
+LEFT JOIN Solution_LargerHazardList AS list ON Item.LargerHazardListId=list.LargerHazardListId
+LEFT JOIN Base_Project AS Project ON Project.ProjectId=list.ProjectId
+LEFT JOIN WBS_UnitWork AS UnitWork ON Item.UnitWorkId=UnitWork.UnitWorkId
+--LEFT JOIN WBS_WorkPackage AS Package ON Item.WorkPackageId=Package.WorkPackageId
+LEFT JOIN Base_Unit AS Unit ON Item.UnitId=Unit.UnitId
+LEFT JOIN Sys_Const AS constw ON Item.WorkStates=constw.ConstValue AND constw.GroupId='WorkStates' 
+GO
+
+
+ALTER VIEW [dbo].[View_WBS]
+AS
+select '1' as Id,'0' as SupId ,'JZ' as Code, '建筑工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,
+ProjectId from dbo.WBS_UnitWork 
+Union
+select '2' as Id,'0' as SupId ,'AZ' as Code, '安装工程' as Name,'ProjectType' as WBSType,null as PlanStartDate,null as PlanEndDate,null as RealEndDate,null as WBSCode,
+ProjectId from dbo.WBS_UnitWork 
+Union
+select UnitWorkId as Id,ProjectType as SupId ,UnitWorkCode as Code, UnitWorkCode+'-'+UnitWorkName as Name,'UnitWork' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
+ProjectId from dbo.WBS_UnitWork 
+Union all
+select WorkPackageId as id,UnitWorkId as SupId,WorkPackageCode as Code,WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
+ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is null
+Union all
+select WorkPackageId as id,SuperWorkPackageId as SupId,WorkPackageCode as Code, WorkPackageCode+'-'+PackageContent as Name,'WorkPackage' as WBSType,PlanStartDate, PlanEndDate,RealEndDate,WBSCode,
+ProjectId from dbo.WBS_WorkPackage w where IsApprove=1 and SuperWorkPackageId is not null
+
+
+
+
+
+
+
+GO
+
+