diff --git a/DataBase/版本日志/SGGLDB_WH_2025-04-07-xiaj.sql b/DataBase/版本日志/SGGLDB_WH_2025-04-07-xiaj.sql
new file mode 100644
index 00000000..b0c12d90
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2025-04-07-xiaj.sql
@@ -0,0 +1,82 @@
+
+
+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,
+ (CASE WHEN Registration.states='3' THEN '' ELSE 'δ' END ) AS ConfirmStr,
+ 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
+
+
diff --git a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
index c9bd25ed..565c5768 100644
--- a/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
+++ b/SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
@@ -74,7 +74,7 @@ namespace BLL
HandleIdea = hazardRegister.HandleIdea,
CutPayment = hazardRegister.CutPayment,
ProblemTypes = hazardRegister.ProblemTypes,
- RegisterTypesId = hazardRegister.RegisterTypesId,
+ //RegisterTypesId = hazardRegister.RegisterTypesId,
CheckCycle = hazardRegister.CheckCycle,
SafeSupervisionIsOK = hazardRegister.SafeSupervisionIsOK,
IsWx = "Y",
diff --git a/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs b/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs
index 85217206..4435aeaf 100644
--- a/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs
+++ b/SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs
@@ -60,7 +60,7 @@ namespace BLL
AutoReset = true
};
messageTimer.Elapsed += new ElapsedEventHandler(UpdateSitePerson);
- messageTimer.Interval = 1000 * 60 * 60 * 24;// 60分钟 60000 * adTimeJ;
+ messageTimer.Interval = 1000 * 60 * 30;// 60分钟 60000 * adTimeJ;
messageTimer.Start();
}
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 49595194..f898226a 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19815,7 +19815,7 @@
-
+