diff --git a/DataBase/版本日志/SGGLDB_V2021-12-03-001(集团安全检查及报表).sql b/DataBase/版本日志/SGGLDB_V2021-12-03-001(集团安全检查及报表).sql new file mode 100644 index 00000000..33be49d5 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2021-12-03-001(集团安全检查及报表).sql @@ -0,0 +1,253 @@ +--ʱ +INSERT INTO SGGLDB_WH.dbo.Information_MillionsMonthlyReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_MillionsMonthlyReport AS B +WHERE B.MillionsMonthlyReportId NOT IN (SELECT MillionsMonthlyReportId FROM SGGLDB_WH.dbo.Information_MillionsMonthlyReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Information_MillionsMonthlyReportItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_MillionsMonthlyReportItem AS B +WHERE B.MillionsMonthlyReportItemId NOT IN (SELECT MillionsMonthlyReportItemId FROM SGGLDB_WH.dbo.Information_MillionsMonthlyReportItem) +AND B.MillionsMonthlyReportId IN (SELECT MillionsMonthlyReportId FROM SGGLDB_WH.dbo.Information_MillionsMonthlyReport ) +GO + +INSERT INTO SGGLDB_WH.dbo.ProjectData_FlowOperate +SELECT * +FROM SUBHSSEDB_WH.DBO.ProjectData_FlowOperate AS B +WHERE B.DataId NOT IN (SELECT DataId FROM SGGLDB_WH.dbo.ProjectData_FlowOperate) +AND B.DataId IN (SELECT MillionsMonthlyReportId FROM SGGLDB_WH.dbo.Information_MillionsMonthlyReport) +GO + + +--ְҵ +INSERT INTO SGGLDB_WH.dbo.Information_AccidentCauseReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_AccidentCauseReport AS B +WHERE B.AccidentCauseReportId NOT IN (SELECT AccidentCauseReportId FROM SGGLDB_WH.dbo.Information_AccidentCauseReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Information_AccidentCauseReportItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_AccidentCauseReportItem AS B +WHERE B.AccidentCauseReportItemId NOT IN (SELECT AccidentCauseReportItemId FROM SGGLDB_WH.dbo.Information_AccidentCauseReportItem) +AND B.AccidentCauseReportId IN (SELECT AccidentCauseReportId FROM SGGLDB_WH.dbo.Information_AccidentCauseReport ) +GO + +INSERT INTO SGGLDB_WH.dbo.ProjectData_FlowOperate +SELECT * +FROM SUBHSSEDB_WH.DBO.ProjectData_FlowOperate AS B +WHERE B.DataId NOT IN (SELECT DataId FROM SGGLDB_WH.dbo.ProjectData_FlowOperate) +AND B.DataId IN (SELECT AccidentCauseReportId FROM SGGLDB_WH.dbo.Information_AccidentCauseReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Sys_CodeRecords +SELECT * +FROM SUBHSSEDB_WH.DBO.Sys_CodeRecords AS B +WHERE B.DataId NOT IN (SELECT DataId FROM SGGLDB_WH.dbo.Sys_CodeRecords) +AND B.DataId IN (SELECT AccidentCauseReportId FROM SGGLDB_WH.dbo.Information_AccidentCauseReport) +GO +--ȫɼ +INSERT INTO SGGLDB_WH.dbo.Information_SafetyQuarterlyReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_SafetyQuarterlyReport AS B +WHERE B.SafetyQuarterlyReportId NOT IN (SELECT SafetyQuarterlyReportId + FROM SGGLDB_WH.dbo.Information_SafetyQuarterlyReport) +GO + + +INSERT INTO SGGLDB_WH.dbo.ProjectData_FlowOperate +SELECT * +FROM SUBHSSEDB_WH.DBO.ProjectData_FlowOperate AS B +WHERE B.DataId NOT IN (SELECT DataId FROM SGGLDB_WH.dbo.ProjectData_FlowOperate) +AND B.DataId IN (SELECT SafetyQuarterlyReportId FROM SGGLDB_WH.dbo.Information_SafetyQuarterlyReport) +GO + +--Ӧչ +INSERT INTO SGGLDB_WH.dbo.Information_DrillConductedQuarterlyReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_DrillConductedQuarterlyReport AS B +WHERE B.DrillConductedQuarterlyReportId NOT IN (SELECT DrillConductedQuarterlyReportId FROM SGGLDB_WH.dbo.Information_DrillConductedQuarterlyReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Information_DrillConductedQuarterlyReportItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_DrillConductedQuarterlyReportItem AS B +WHERE B.DrillConductedQuarterlyReportItemId NOT IN (SELECT DrillConductedQuarterlyReportItemId FROM SGGLDB_WH.dbo.Information_DrillConductedQuarterlyReportItem) +AND B.DrillConductedQuarterlyReportId IN (SELECT DrillConductedQuarterlyReportId FROM SGGLDB_WH.dbo.Information_DrillConductedQuarterlyReport) +GO + +INSERT INTO SGGLDB_WH.dbo.ProjectData_FlowOperate +SELECT * +FROM SUBHSSEDB_WH.DBO.ProjectData_FlowOperate AS B +WHERE B.DataId NOT IN (SELECT DataId FROM SGGLDB_WH.dbo.ProjectData_FlowOperate) +AND B.DataId IN (SELECT DrillConductedQuarterlyReportId FROM SGGLDB_WH.dbo.Information_DrillConductedQuarterlyReport) +GO + +--Ӧչ걨 +INSERT INTO SGGLDB_WH.dbo.Information_DrillPlanHalfYearReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_DrillPlanHalfYearReport AS B +WHERE B.DrillPlanHalfYearReportId NOT IN (SELECT DrillPlanHalfYearReportId FROM SGGLDB_WH.dbo.Information_DrillPlanHalfYearReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Information_DrillPlanHalfYearReportItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_DrillPlanHalfYearReportItem AS B +WHERE B.DrillPlanHalfYearReportItemId NOT IN (SELECT DrillPlanHalfYearReportItemId FROM SGGLDB_WH.dbo.Information_DrillPlanHalfYearReportItem) +AND B.DrillPlanHalfYearReportId IN (SELECT DrillPlanHalfYearReportId FROM SGGLDB_WH.dbo.Information_DrillPlanHalfYearReport) +GO + +INSERT INTO SGGLDB_WH.dbo.ProjectData_FlowOperate +SELECT * +FROM SUBHSSEDB_WH.DBO.ProjectData_FlowOperate AS B +WHERE B.DataId NOT IN (SELECT DataId FROM SGGLDB_WH.dbo.ProjectData_FlowOperate) +AND B.DataId IN (SELECT DrillPlanHalfYearReportId FROM SGGLDB_WH.dbo.Information_DrillPlanHalfYearReport) +GO + +--߱ +INSERT INTO SGGLDB_WH.dbo.Information_UrgeReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Information_UrgeReport AS B +WHERE B.UrgeReportId NOT IN (SELECT UrgeReportId FROM SGGLDB_WH.dbo.Information_UrgeReport) +GO + +--Űȫල +INSERT INTO SGGLDB_WH.dbo.Check_CheckInfo +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckInfo AS B +WHERE B.CheckInfoId NOT IN (SELECT CheckInfoId FROM SGGLDB_WH.dbo.Check_CheckInfo) +GO + +INSERT INTO SGGLDB_WH.dbo.Check_CheckInfo_CheckFile +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckInfo_CheckFile AS B +WHERE B.CheckFileId NOT IN (SELECT CheckFileId FROM SGGLDB_WH.dbo.Check_CheckInfo_CheckFile) +GO + +INSERT INTO SGGLDB_WH.dbo.Check_CheckInfo_CheckTeam +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckInfo_CheckTeam AS B +WHERE B.CheckTeamId NOT IN (SELECT CheckTeamId FROM SGGLDB_WH.dbo.Check_CheckInfo_CheckTeam) +GO + +INSERT INTO SGGLDB_WH.dbo.Check_CheckInfo_Table5Item +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckInfo_Table5Item AS B +WHERE B.ID NOT IN (SELECT ID FROM SGGLDB_WH.dbo.Check_CheckInfo_Table5Item) +GO + +INSERT INTO SGGLDB_WH.dbo.Check_CheckInfo_Table8 +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckInfo_Table8 AS B +WHERE B.CheckItemId NOT IN (SELECT CheckItemId FROM SGGLDB_WH.dbo.Check_CheckInfo_Table8) +GO + +INSERT INTO SGGLDB_WH.dbo.Check_CheckInfo_Table8Item +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckInfo_Table8Item AS B +WHERE B.ID NOT IN (SELECT ID FROM SGGLDB_WH.dbo.Check_CheckInfo_Table8Item) +GO + +--ල +INSERT INTO SGGLDB_WH.dbo.Check_CheckRectify +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckRectify AS B +WHERE B.CheckRectifyId NOT IN (SELECT CheckRectifyId FROM SGGLDB_WH.dbo.Check_CheckRectify) +GO + +INSERT INTO SGGLDB_WH.dbo.Check_CheckRectifyItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Check_CheckRectifyItem AS B +WHERE B.CheckRectifyItemId NOT IN (SELECT CheckRectifyItemId FROM SGGLDB_WH.dbo.Check_CheckRectifyItem) +AND B.CheckRectifyId IN (SELECT CheckRectifyId FROM SGGLDB_WH.dbo.Check_CheckRectify) +GO + +--ȫļϱ +INSERT INTO SGGLDB_WH.dbo.Supervise_SubUnitReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_SubUnitReport AS B +WHERE B.SubUnitReportId NOT IN (SELECT SubUnitReportId FROM SGGLDB_WH.dbo.Supervise_SubUnitReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Supervise_SubUnitReportItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_SubUnitReportItem AS B +WHERE B.SubUnitReportItemId NOT IN (SELECT SubUnitReportItemId FROM SGGLDB_WH.dbo.Supervise_SubUnitReportItem) +AND B.SubUnitReportId IN (SELECT SubUnitReportId FROM SGGLDB_WH.dbo.Check_CheckRectify) +GO + +INSERT INTO SGGLDB_WH.dbo.AttachFile(AttachFileId,ToKeyId,AttachSource,AttachUrl,MenuId,AttachPath) +SELECT AttachFileId,ToKeyId,AttachSource,AttachUrl,MenuId,AttachPath +FROM SUBHSSEDB_WH.DBO.AttachFile AS B +WHERE B.ToKeyId NOT IN (SELECT ToKeyId FROM SGGLDB_WH.dbo.AttachFile) +AND B.ToKeyId IN (SELECT SubUnitReportItemId FROM SGGLDB_WH.dbo.Supervise_SubUnitReportItem) +GO + +--ҵȫ +INSERT INTO SGGLDB_WH.dbo.Supervise_SuperviseCheckReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_SuperviseCheckReport AS B +WHERE B.SuperviseCheckReportId NOT IN (SELECT SuperviseCheckReportId FROM SGGLDB_WH.dbo.Supervise_SuperviseCheckReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Supervise_SubUnitCheckRectify +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_SubUnitCheckRectify AS B +WHERE B.SubUnitCheckRectifyId NOT IN (SELECT SubUnitCheckRectifyId FROM SGGLDB_WH.dbo.Supervise_SubUnitCheckRectify) +AND B.SuperviseCheckReportId IN (SELECT SuperviseCheckReportId FROM SGGLDB_WH.dbo.Supervise_SuperviseCheckReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Supervise_SubUnitCheckRectifyItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_SubUnitCheckRectifyItem AS B +WHERE B.SubUnitCheckRectifyItemId NOT IN (SELECT SubUnitCheckRectifyItemId FROM SGGLDB_WH.dbo.Supervise_SubUnitCheckRectifyItem) +AND B.SubUnitCheckRectifyId IN (SELECT SubUnitCheckRectifyId FROM SGGLDB_WH.dbo.Check_CheckRectify) +GO + +--ҵȫල +INSERT INTO SGGLDB_WH.dbo.Supervise_SuperviseCheckRectify +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_SuperviseCheckRectify AS B +WHERE B.SuperviseCheckRectifyId NOT IN (SELECT SuperviseCheckRectifyId FROM SGGLDB_WH.dbo.Supervise_SuperviseCheckRectify) +GO + +INSERT INTO SGGLDB_WH.dbo.Technique_Rectify +SELECT * +FROM SUBHSSEDB_WH.DBO.Technique_Rectify AS B +WHERE B.RectifyId NOT IN (SELECT RectifyId FROM SGGLDB_WH.dbo.Technique_Rectify) +GO + +INSERT INTO SGGLDB_WH.dbo.Technique_RectifyItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Technique_RectifyItem AS B +WHERE B.RectifyItemId NOT IN (SELECT RectifyItemId FROM SGGLDB_WH.dbo.Technique_RectifyItem) +GO + +INSERT INTO SGGLDB_WH.dbo.Supervise_SuperviseCheckRectifyItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_SuperviseCheckRectifyItem AS B +WHERE B.SuperviseCheckRectifyItemId NOT IN (SELECT SuperviseCheckRectifyItemId FROM SGGLDB_WH.dbo.Supervise_SuperviseCheckRectifyItem) +AND B.SuperviseCheckRectifyId IN (SELECT SuperviseCheckRectifyId FROM SGGLDB_WH.dbo.Check_CheckRectify) +GO + +--ҵල鱨 +INSERT INTO SGGLDB_WH.dbo.Supervise_UpCheckReport +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_UpCheckReport AS B +WHERE B.UpCheckReportId NOT IN (SELECT UpCheckReportId FROM SGGLDB_WH.dbo.Supervise_UpCheckReport) +GO + +INSERT INTO SGGLDB_WH.dbo.Supervise_UpCheckReportItem +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_UpCheckReportItem AS B +WHERE B.UpCheckReportItemId NOT IN (SELECT UpCheckReportItemId FROM SGGLDB_WH.dbo.Supervise_UpCheckReportItem) +AND B.UpCheckReportId IN (SELECT UpCheckReportId FROM SGGLDB_WH.dbo.Check_CheckRectify) +GO + +INSERT INTO SGGLDB_WH.dbo.Supervise_UpCheckReportItem2 +SELECT * +FROM SUBHSSEDB_WH.DBO.Supervise_UpCheckReportItem2 AS B +WHERE B.UpCheckReportItem2Id NOT IN (SELECT UpCheckReportItem2Id FROM SGGLDB_WH.dbo.Supervise_UpCheckReportItem2) +AND B.UpCheckReportId IN (SELECT UpCheckReportId FROM SGGLDB_WH.dbo.Check_CheckRectify) +GO \ No newline at end of file diff --git a/SGGL/BLL/OpenService/MonitorService.cs b/SGGL/BLL/OpenService/MonitorService.cs index 630331f8..1a08e481 100644 --- a/SGGL/BLL/OpenService/MonitorService.cs +++ b/SGGL/BLL/OpenService/MonitorService.cs @@ -2177,7 +2177,7 @@ namespace BLL GetDataService.CloseLicenseData(); //////推送订阅消息 GetDataService.SendSubscribeMessage(); - GetDataService.CorrectingPersonInOutNumber(null); + // GetDataService.CorrectingPersonInOutNumber(null); } } }