diff --git a/DataBase/版本日志/SGGLDB_V2025-01-25-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-01-25-001-gaofei.sql
new file mode 100644
index 00000000..f12d36c1
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-01-25-001-gaofei.sql
@@ -0,0 +1,37 @@
+
+
+--ע⣡ִ֮ǰ¿ͻûϱ˵Menu_ZHGLûMenuTypeΪMenu_ZHGL
+
+--Ŷ
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '8B9C0F42-D36F-4798-94AB-F56723E8B714')
+BEGIN
+ --Ŷ
+ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+ VALUES('8B9C0F42-D36F-4798-94AB-F56723E8B714','Ŷ',null,60,'0','Menu_ZHGL',1,0,1)
+
+ --֪ͨ
+ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+ VALUES('15443DE9-4AC2-43F9-A622-9F9253ECB157','֪ͨ','DCGL/ServerCheck/CheckNotice.aspx',10,'8B9C0F42-D36F-4798-94AB-F56723E8B714','Menu_ZHGL',1,1,1)
+
+ --·
+ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+ VALUES('2E4A3E58-44B7-41B0-BFE3-634DF29AAE27','·','DCGL/ServerCheck/CheckRectify.aspx',20,'8B9C0F42-D36F-4798-94AB-F56723E8B714','Menu_ZHGL',1,1,1)
+END
+GO
+
+
+--·İť
+IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '2E4A3E58-44B7-41B0-BFE3-634DF29AAE27')
+BEGIN
+ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES('002D5E43-8A3B-4B48-8058-5175347224BD','2E4A3E58-44B7-41B0-BFE3-634DF29AAE27','',1)
+ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES('D8548A9A-5522-4DBC-BF17-31EE21AA97E9','2E4A3E58-44B7-41B0-BFE3-634DF29AAE27','',2)
+END
+GO
+
+
+
+
+
+
diff --git a/DataBase/版本日志/SGGLDB_V2025-01-25-002-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-01-25-002-gaofei.sql
new file mode 100644
index 00000000..715a0112
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_V2025-01-25-002-gaofei.sql
@@ -0,0 +1,301 @@
+
+
+--DCGL_Check_CheckInfo
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'DCGL_Check_CheckInfo') AND type = N'U')
+BEGIN
+
+CREATE TABLE [dbo].[DCGL_Check_CheckInfo](
+ [CheckInfoId] [nvarchar](50) NOT NULL,
+ [CheckTypeName] [nvarchar](50) NOT NULL,
+ [SubjectUnitId] [nvarchar](50) NOT NULL,
+ [SubjectUnitAdd] [nvarchar](500) NULL,
+ [SubjectUnitMan] [nvarchar](50) NULL,
+ [SubjectUnitTel] [nvarchar](50) NULL,
+ [CheckStartTime] [datetime] NOT NULL,
+ [CheckEndTime] [datetime] NOT NULL,
+ [SubjectObject] [nvarchar](500) NULL,
+ [CheckTeamLeader] [nvarchar](50) NULL,
+ [CompileMan] [nvarchar](50) NULL,
+ [CompileDate] [datetime] NULL,
+ [CheckTeamLeaderName] [nvarchar](50) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [SexName] [nvarchar](5) NULL,
+ [SupervisionGroupId] [nvarchar](50) NULL,
+ [SupervisionGroupName] [nvarchar](50) NULL,
+ [SubjectProjectId] [nvarchar](50) NULL,
+ [SubjectProjectName] [nvarchar](200) NULL,
+ [SubjectUnitManId] [nvarchar](50) NULL,
+ [CheckManId] [nvarchar](50) NULL,
+ [CheckManName] [nvarchar](50) NULL,
+ CONSTRAINT [PK_DCGL_Check_CheckInfo] PRIMARY KEY CLUSTERED
+(
+ [CheckInfoId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckInfo_Base_Unit] FOREIGN KEY([SubjectUnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo] CHECK CONSTRAINT [FK_DCGL_Check_CheckInfo_Base_Unit]
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckInfo_Base_Unit1] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo] CHECK CONSTRAINT [FK_DCGL_Check_CheckInfo_Base_Unit1]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鷽ʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'CheckTypeName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܼ쵥λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'SubjectUnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܼ쵥λַ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'SubjectUnitAdd'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܼ쵥λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'SubjectUnitMan'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܼ쵥λ绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'SubjectUnitTel'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鿪ʼʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'CheckStartTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'CheckEndTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'SubjectObject'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鳤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'CheckTeamLeader'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鳤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'CheckTeamLeaderName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鳤λID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo', @level2type=N'COLUMN',@level2name=N'SexName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo'
+
+END
+GO
+
+
+
+--DCGL_Check_CheckInfo_CheckFile
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'DCGL_Check_CheckInfo_CheckFile') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[DCGL_Check_CheckInfo_CheckFile](
+ [CheckFileId] [nvarchar](50) NOT NULL,
+ [CheckInfoId] [nvarchar](50) NULL,
+ [CheckFileName] [nvarchar](500) NULL,
+ [SortIndex] [int] NULL,
+ [Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_DCGL_Check_CheckInfo_CheckFile] PRIMARY KEY CLUSTERED
+(
+ [CheckFileId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckFile] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckFile_DCGL_Check_CheckInfo] FOREIGN KEY([CheckInfoId])
+REFERENCES [dbo].[DCGL_Check_CheckInfo] ([CheckInfoId])
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckFile] CHECK CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckFile_DCGL_Check_CheckInfo]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ලid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckFile', @level2type=N'COLUMN',@level2name=N'CheckInfoId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckFile', @level2type=N'COLUMN',@level2name=N'CheckFileName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckFile', @level2type=N'COLUMN',@level2name=N'SortIndex'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckFile', @level2type=N'COLUMN',@level2name=N'Remark'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckFile'
+END
+GO
+
+
+
+--DCGL_Check_CheckInfo_CheckTeam
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'DCGL_Check_CheckInfo_CheckTeam') AND type = N'U')
+BEGIN
+
+CREATE TABLE [dbo].[DCGL_Check_CheckInfo_CheckTeam](
+ [CheckTeamId] [nvarchar](50) NOT NULL,
+ [CheckInfoId] [nvarchar](50) NULL,
+ [UserId] [nvarchar](50) NULL,
+ [SortIndex] [int] NULL,
+ [PostName] [nvarchar](200) NULL,
+ [WorkTitle] [nvarchar](200) NULL,
+ [CheckPostName] [nvarchar](200) NULL,
+ [CheckDate] [datetime] NULL,
+ [UserName] [nvarchar](50) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [SexName] [nvarchar](5) NULL,
+ [SupervisionGroupId] [nvarchar](50) NULL,
+ [SupervisionGroupName] [nvarchar](50) NULL,
+ CONSTRAINT [PK_DCGL_Check_CheckInfo_CheckTeam] PRIMARY KEY CLUSTERED
+(
+ [CheckTeamId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckTeam] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckTeam_Base_Unit1] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckTeam] CHECK CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckTeam_Base_Unit1]
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckTeam] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckTeam_Check_CheckInfo] FOREIGN KEY([CheckInfoId])
+REFERENCES [dbo].[DCGL_Check_CheckInfo] ([CheckInfoId])
+ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckTeam] CHECK CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckTeam_Check_CheckInfo]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'CheckInfoId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԱId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'UserId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'SortIndex'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'PostName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'WorkTitle'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Сְ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'CheckPostName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'CheckDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'UserName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԱλID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam', @level2type=N'COLUMN',@level2name=N'SexName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鹤Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_CheckTeam'
+END
+GO
+
+
+
+
+
+--DCGL_Check_CheckInfo_TableNoticeItem
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'DCGL_Check_CheckInfo_TableNoticeItem') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[DCGL_Check_CheckInfo_TableNoticeItem](
+ [ID] [nvarchar](50) NOT NULL,
+ [CheckInfoId] [nvarchar](50) NULL,
+ [SortIndex] [int] NULL,
+ [Describe] [nvarchar](800) NULL,
+ [Standards] [nvarchar](800) NULL,
+ [Advice] [nvarchar](800) NULL,
+ [LimitTime] [datetime] NULL,
+ [Situation] [nvarchar](800) NULL,
+ [Remark] [nvarchar](800) NULL,
+ [Url] [nvarchar](2000) NULL,
+ [AffUrl] [nvarchar](2000) NULL,
+ [RiskLevel] [nvarchar](50) NULL,
+ [ProblemTypes] [char](1) NULL,
+ [ProblemSubTypeId] [nvarchar](50) NULL,
+ [ProblemSubType] [nvarchar](100) NULL,
+ [States] [nvarchar](2) NULL,
+ CONSTRAINT [PK_Check_CheckInfo_TableNoticeItem] 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]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ල' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'CheckInfoId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'SortIndex'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'Describe'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ݱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'Standards'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'Advice'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'LimitTime'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'Situation'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ǰƬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'Url'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĺƬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem', @level2type=N'COLUMN',@level2name=N'AffUrl'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȼϸ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckInfo_TableNoticeItem'
+
+END
+GO
+
+
+
+--DCGL_Check_CheckRectify
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'DCGL_Check_CheckRectify') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[DCGL_Check_CheckRectify](
+ [CheckRectifyId] [nvarchar](50) NOT NULL,
+ [CheckRectifyCode] [nvarchar](50) NOT NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [CheckDate] [datetime] NULL,
+ [IssueMan] [nvarchar](50) NULL,
+ [IssueDate] [datetime] NULL,
+ [HandleState] [char](1) NULL,
+ [ProjectName] [nvarchar](500) NULL,
+ CONSTRAINT [PK_DCGL_Check_CheckRectify] PRIMARY KEY CLUSTERED
+(
+ [CheckRectifyId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE [dbo].[DCGL_Check_CheckRectify] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckRectify_Base_Unit] FOREIGN KEY([UnitId])
+REFERENCES [dbo].[Base_Unit] ([UnitId])
+ALTER TABLE [dbo].[DCGL_Check_CheckRectify] CHECK CONSTRAINT [FK_DCGL_Check_CheckRectify_Base_Unit]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'CheckRectifyId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'CheckRectifyCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'ProjectId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鵥λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܼʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'CheckDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ǩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'IssueMan'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ǩʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'IssueDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify', @level2type=N'COLUMN',@level2name=N'ProjectName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ı' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectify'
+END
+GO
+
+
+--DCGL_Check_CheckRectifyItem
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'DCGL_Check_CheckRectifyItem') AND type = N'U')
+BEGIN
+
+CREATE TABLE [dbo].[DCGL_Check_CheckRectifyItem](
+ [CheckRectifyItemId] [nvarchar](50) NOT NULL,
+ [CheckRectifyId] [nvarchar](50) NULL,
+ [NoticeItemId] [nvarchar](50) NULL,
+ [ConfirmMan] [nvarchar](50) NULL,
+ [ConfirmManName] [nvarchar](50) NULL,
+ [ConfirmDate] [datetime] NULL,
+ [OrderEndDate] [datetime] NULL,
+ [OrderEndPerson] [nvarchar](50) NULL,
+ [RealEndDate] [datetime] NULL,
+ [Verification] [nvarchar](50) NULL,
+ CONSTRAINT [PK_DCGL_Check_CheckRectifyItem] PRIMARY KEY CLUSTERED
+(
+ [CheckRectifyItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+ALTER TABLE [dbo].[DCGL_Check_CheckRectifyItem] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckRectifyItem_Check_CheckRectify] FOREIGN KEY([CheckRectifyId])
+REFERENCES [dbo].[DCGL_Check_CheckRectify] ([CheckRectifyId])
+ALTER TABLE [dbo].[DCGL_Check_CheckRectifyItem] CHECK CONSTRAINT [FK_DCGL_Check_CheckRectifyItem_Check_CheckRectify]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'CheckRectifyItemId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'CheckRectifyId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'NoticeItemId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'ConfirmMan'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'ConfirmManName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'ConfirmDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ҫʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'OrderEndDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'OrderEndPerson'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'RealEndDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵȫ֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem', @level2type=N'COLUMN',@level2name=N'Verification'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϸ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DCGL_Check_CheckRectifyItem'
+END
+GO
+
+
+
+--View_DCGL_CheckRectifyListFromSUB
+CREATE VIEW [dbo].[View_DCGL_CheckRectifyListFromSUB]
+AS
+/*ӹ˾ĵͼ*/
+SELECT CheckRectifyItem.CheckRectifyItemId
+ ,CheckRectifyItem.CheckRectifyId
+ ,CheckRectifyItem.NoticeItemId
+ ,CheckRectifyItem.ConfirmMan
+ ,CheckRectifyItem.ConfirmManName
+ ,CheckRectifyItem.ConfirmDate
+ ,CheckRectifyItem.OrderEndDate
+ ,CheckRectifyItem.OrderEndPerson
+ ,CheckRectifyItem.RealEndDate
+ ,CheckRectifyItem.Verification
+ ,CheckRectify.CheckRectifyCode
+ ,CheckRectify.ProjectId
+ ,CheckRectify.UnitId
+ ,CheckRectify.CheckDate
+ ,CheckRectify.IssueMan
+ ,CheckRectify.IssueDate
+ ,CheckRectify.HandleState
+ ,NoticeItem.SortIndex AS SortIndex
+ ,'' AS WorkType
+ ,'' AS DangerPoint
+ ,'⣩:'+NoticeItem.Describe+';ݱ:'+NoticeItem.Standards+';:'+NoticeItem.Advice AS RiskExists
+ ,'' AS IsProject
+ ,'' AS CheckMan
+ ,'' AS SubjectUnitMan
+ --,Table5Item.SortIndex
+ --,Table5Item.WorkType
+ --,Table5Item.DangerPoint
+ --,Table5Item.RiskExists
+ --,Table5Item.IsProject
+ --,Table5Item.CheckMan
+ --,Table5Item.SubjectUnitMan
+ ,AttachFile.AttachFileId
+ ,AttachFile.ToKeyId
+ ,AttachFile.AttachSource
+ ,AttachFile.AttachUrl
+ ,AttachFile2.AttachFileId AS AttachFileId2
+ ,AttachFile2.ToKeyId AS ToKeyId2
+ ,AttachFile2.AttachSource AS AttachSource2
+ ,AttachFile2.AttachUrl AS AttachUrl2
+FROM dbo.DCGL_Check_CheckRectifyItem AS CheckRectifyItem
+LEFT JOIN dbo.DCGL_Check_CheckRectify AS CheckRectify ON CheckRectifyItem.CheckRectifyid=CheckRectify.CheckRectifyId
+--LEFT JOIN dbo.Check_CheckInfo_Table5Item as Table5Item on CheckRectifyItem.Table5ItemId=Table5Item.ID
+LEFT JOIN DCGL_Check_CheckInfo_TableNoticeItem AS NoticeItem ON CheckRectifyItem.NoticeItemId=NoticeItem.ID
+LEFT JOIN dbo.AttachFile AS AttachFile on AttachFile.ToKeyId =CheckRectifyItem.NoticeItemId
+LEFT JOIN dbo.AttachFile AS AttachFile2 on AttachFile2.ToKeyId =CheckRectifyItem.CheckRectifyItemId
+
+
+GO
+
+
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 8e35072f..5e1398c9 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -349,6 +349,8 @@
+
+
@@ -571,6 +573,7 @@
+
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index c8047891..153ce344 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -5140,5 +5140,20 @@ namespace BLL
/// 中央企业安全生产管理评价工作调度台账上报
///
public const string ReportType_12 = "12";
+
+
+ #region 集团督查检查
+
+ ///
+ /// 企业上报督查检查报告
+ ///
+ public const string UpDCGLCheckReportMenuId = "2E4A3E58-44B7-41B0-BFE3-634DF29AAE27";// "B9950CB5-C47A-4C0A-A6CC-C7DDBBDE7D1E";
+ ///
+ /// 集团下发督查检查整改
+ ///
+ public const string DCGLCheckRectifyMenuId = "2E4A3E58-44B7-41B0-BFE3-634DF29AAE27";
+
+ #endregion
+
}
}
\ No newline at end of file
diff --git a/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyItemService.cs b/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyItemService.cs
new file mode 100644
index 00000000..9cb9afe4
--- /dev/null
+++ b/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyItemService.cs
@@ -0,0 +1,61 @@
+using Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// 督查检查整改明细表
+ ///
+ public static class DCGLCheckRectifyItemService
+ {
+ ///
+ /// 根据主键获取督查检查整改明细信息
+ ///
+ ///
+ ///
+ public static Model.DCGL_Check_CheckRectifyItem GetCheckRectifyItemByTable5ItemId(string noticeItemId)
+ {
+ return Funs.DB.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.NoticeItemId == noticeItemId);
+ }
+
+ ///
+ /// 根据督查检查整改id获取所有相关明细信息
+ ///
+ ///
+ ///
+ public static List GetCheckRectifyItemByCheckRectifyId(string checkRectifyId)
+ {
+ return (from x in Funs.DB.DCGL_Check_CheckRectifyItem where x.CheckRectifyId == checkRectifyId select x).ToList();
+ }
+
+ ///
+ /// 根据主键获取督查检查整改明细信息
+ ///
+ ///
+ ///
+ public static Model.DCGL_Check_CheckRectifyItem GetCheckRectifyItemByCheckRectifyItemId(string checkRectifyItemId)
+ {
+ return Funs.DB.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == checkRectifyItemId);
+ }
+
+ ///
+ /// 添加督查检查整改明细信息
+ ///
+ ///
+ public static void UpdateCheckRectifyItem(Model.DCGL_Check_CheckRectifyItem CheckRectifyItem)
+ {
+ var newCheckRectifyItem = Funs.DB.DCGL_Check_CheckRectifyItem.FirstOrDefault(x => x.CheckRectifyItemId == CheckRectifyItem.CheckRectifyItemId);
+ if (newCheckRectifyItem != null)
+ {
+ newCheckRectifyItem.OrderEndPerson = CheckRectifyItem.OrderEndPerson;
+ newCheckRectifyItem.RealEndDate = CheckRectifyItem.RealEndDate;
+ newCheckRectifyItem.Verification = CheckRectifyItem.Verification;
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs b/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs
new file mode 100644
index 00000000..01b1c0aa
--- /dev/null
+++ b/SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ public static class DCGLCheckRectifyService
+ {
+ ///
+ /// 根据整改ID获取督查检查信息
+ ///
+ ///
+ ///
+ public static Model.DCGL_Check_CheckRectify GetCheckRectifyByCheckRectifyId(string checkRectifyId)
+ {
+ return Funs.DB.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == checkRectifyId);
+ }
+
+ ///
+ /// 添加督查检查整改
+ ///
+ ///
+ public static void AddCheckRectify(Model.DCGL_Check_CheckRectify checkRectify)
+ {
+ Model.DCGL_Check_CheckRectify newCheckRectify = new Model.DCGL_Check_CheckRectify
+ {
+ CheckRectifyId = checkRectify.CheckRectifyId,
+ CheckRectifyCode = checkRectify.CheckRectifyCode,
+ ProjectId = checkRectify.ProjectId,
+ UnitId = checkRectify.UnitId,
+ CheckDate = checkRectify.CheckDate,
+ IssueMan = checkRectify.IssueMan,
+ IssueDate = checkRectify.IssueDate,
+ HandleState = checkRectify.HandleState
+ };
+ Funs.DB.DCGL_Check_CheckRectify.InsertOnSubmit(newCheckRectify);
+ Funs.DB.SubmitChanges();
+ }
+
+ ///
+ /// 修改督查检查整改
+ ///
+ ///
+ public static void UpdateCheckRectify(Model.DCGL_Check_CheckRectify checkRectify)
+ {
+ Model.DCGL_Check_CheckRectify newCheckRectify = Funs.DB.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == checkRectify.CheckRectifyId);
+ if (newCheckRectify != null)
+ {
+ newCheckRectify.CheckRectifyCode = checkRectify.CheckRectifyCode;
+ newCheckRectify.ProjectId = checkRectify.ProjectId;
+ newCheckRectify.UnitId = checkRectify.UnitId;
+ newCheckRectify.CheckDate = checkRectify.CheckDate;
+ newCheckRectify.IssueMan = checkRectify.IssueMan;
+ newCheckRectify.IssueDate = checkRectify.IssueDate;
+
+ newCheckRectify.HandleState = checkRectify.HandleState;
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/OpenService/FileInsertService.cs b/SGGL/BLL/OpenService/FileInsertService.cs
new file mode 100644
index 00000000..3f19aac2
--- /dev/null
+++ b/SGGL/BLL/OpenService/FileInsertService.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.IO;
+using System.Web;
+
+namespace BLL
+{
+ public static class FileInsertService
+ {
+ ///
+ /// 获取附件数据流类
+ ///
+ /// 附件路径
+ ///
+ public static void FileInsert(List fileContextList, string attachUrl)
+ {
+ if (fileContextList != null && fileContextList.Count > 0)
+ {
+ string physicalpath = Funs.RootPath;
+ //HttpContext.Current.Request.PhysicalApplicationPath;
+ string fullPath = physicalpath + attachUrl;
+ if (!File.Exists(fullPath))
+ {
+ byte[] fileContext = fileContextList[0];
+ int index = fullPath.LastIndexOf("\\");
+ string filePath = fullPath.Substring(0, index);
+ if (!Directory.Exists(filePath))
+ {
+ Directory.CreateDirectory(filePath);
+ }
+ //string savePath = fullPath + fileName;
+
+ //文件读写模式
+ System.IO.FileMode fileMode = System.IO.FileMode.Create;
+ //写入文件
+ using (System.IO.FileStream fs = new System.IO.FileStream(fullPath, fileMode, System.IO.FileAccess.Write))
+ {
+ fs.Write(fileContext, 0, fileContext.Length);
+ }
+ }
+ }
+ }
+
+ ///
+ /// 获取多附件数据流类
+ ///
+ /// 附件路径
+ ///
+ public static void FileMoreInsert(List fileContextList, string attachUrl)
+ {
+ if (fileContextList != null && fileContextList.Count() > 0)
+ {
+ if (fileContextList.Count > 0)
+ {
+ string[] strs = attachUrl.Trim().Split(',');
+ int i = 0;
+ foreach (var item in fileContextList)
+ {
+ if (strs.Count() > i)
+ {
+ string physicalpath = Funs.RootPath;
+ //HttpContext.Current.Request.PhysicalApplicationPath;
+ string fullPath = physicalpath + strs[i];
+ if (!File.Exists(fullPath))
+ {
+ byte[] fileContext = item;
+ int index = fullPath.LastIndexOf("\\");
+ string filePath = fullPath.Substring(0, index);
+
+ if (!Directory.Exists(filePath))
+ {
+ Directory.CreateDirectory(filePath);
+ }
+ //string savePath = fullPath + fileName;
+
+ //文件读写模式
+ System.IO.FileMode fileMode = System.IO.FileMode.Create;
+
+ //写入文件
+ using (System.IO.FileStream fs = new System.IO.FileStream(fullPath, fileMode, System.IO.FileAccess.Write))
+ {
+ fs.Write(fileContext, 0, fileContext.Length);
+ }
+ }
+
+ i++;
+ }
+ }
+ }
+ }
+ }
+
+ ///
+ /// 数据和附件插入到多附件表
+ ///
+ public static void InsertAttachFile(string attachFileId, string dataId, string attachSource, string attachUrl, List fileContext)
+ {
+ var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.AttachFileId == attachFileId);
+ if (getAtt != null)
+ {
+ Funs.DB.AttachFile.DeleteOnSubmit(getAtt);
+ Funs.DB.SubmitChanges();
+ }
+ //多附件
+ var attachFile = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == dataId);
+ if (attachFile == null && !string.IsNullOrEmpty(attachSource))
+ {
+ Model.AttachFile newAttachFile = new Model.AttachFile
+ {
+ AttachFileId = attachFileId,
+ ToKeyId = dataId,
+ AttachSource = attachSource,
+ AttachUrl = attachUrl
+ };
+ Funs.DB.AttachFile.InsertOnSubmit(newAttachFile);
+ Funs.DB.SubmitChanges();
+ ////插入附件文件
+ BLL.FileInsertService.FileMoreInsert(fileContext, attachUrl);
+ }
+ else
+ {
+ if (attachFile.AttachUrl != attachUrl)
+ {
+ ///删除附件文件
+ BLL.UploadAttachmentService.DeleteFile(Funs.RootPath, attachFile.AttachUrl);
+ ////插入附件文件
+ BLL.FileInsertService.FileMoreInsert(fileContext, attachUrl);
+ attachFile.AttachSource = attachSource;
+ attachFile.AttachUrl = attachUrl;
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
index b7060236..c77e3d26 100644
--- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs
@@ -14,6 +14,8 @@
using RestSharp;
using System.Net;
using Model;
+ using System.Collections;
+ using Newtonsoft.Json.Linq;
public static class CNCECHSSEWebService
{
@@ -1957,6 +1959,87 @@
}
+ #endregion
+
+ #region 督查检查整改上报
+ ///
+ /// 督查检查整改上报
+ ///
+ public static string UpDCGlCheck_CheckRectify(string checkRectifyId, Model.Person_Persons CurrUser)
+ {
+ string code = "0";
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ try
+ {
+ // CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
+ var upCheckReport = from x in db.View_DCGL_CheckRectifyListFromSUB
+ where x.RealEndDate.HasValue && x.CheckRectifyId == checkRectifyId
+ select new Model.DCGLCheckRectifyItem
+ {
+ CheckRectifyId = x.CheckRectifyId,
+ CheckRectifyCode = x.CheckRectifyCode,
+ ProjectId = x.ProjectId,
+ UnitId = x.UnitId,
+ CheckDate = x.CheckDate,
+ IssueMan = x.IssueMan,
+ IssueDate = x.IssueDate,
+ HandleState = x.HandleState,
+ CheckRectifyItemId = x.CheckRectifyItemId,
+ ConfirmMan = x.ConfirmMan,
+ ConfirmDate = x.ConfirmDate,
+ OrderEndDate = x.OrderEndDate,
+ OrderEndPerson = x.OrderEndPerson,
+ RealEndDate = x.RealEndDate,
+ Verification = x.Verification,
+ AttachFileId = x.AttachFileId2,
+ ToKeyId = x.ToKeyId2,
+ AttachSource = x.AttachSource2,
+ AttachUrl = x.AttachUrl2,
+ ////附件转为字节传送
+ FileContext = FileStructService.GetMoreFileStructByAttachUrl(x.AttachUrl2),
+ };
+
+ string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/UpDCGLCheckRectifyTable";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushContent = JsonConvert.SerializeObject(upCheckReport.ToList());
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+
+ if (code == "1")
+ {
+ var getIds = Funs.GetStrListByStr(obj["data"].ToString(), ',');
+ if (getIds.Count() > 0)
+ {
+ foreach (var item in getIds)
+ {
+ var newCheckRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == item);
+ if (newCheckRectify != null)
+ {
+ newCheckRectify.HandleState = BLL.Const.State_3; //已完成
+ db.SubmitChanges();
+ }
+ }
+ }
+ LogService.AddSys_Log(CurrUser, "【集团检查整改】上传到服务器" + getIds.Count.ToString() + "条数据;", null, BLL.Const.UpDCGLCheckReportMenuId, BLL.Const.BtnUploadResources);
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ ErrLogInfo.WriteLog("【集团检查整改】上传到服务器", ex);
+ LogService.AddSys_Log(CurrUser, "【集团检查整改】上传到服务器失败;", null, BLL.Const.UpDCGLCheckReportMenuId, BLL.Const.BtnUploadResources);
+ }
+ return code;
+ }
+ }
#endregion
#endregion
@@ -7121,6 +7204,7 @@
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
}
}
+
}
}
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx
new file mode 100644
index 00000000..3da0881b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx
@@ -0,0 +1,232 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckNotice.aspx.cs" Inherits="FineUIPro.Web.DCGL.ServerCheck.CheckNotice" %>
+
+
+
+
+
+
+ 督查检查通知单
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
new file mode 100644
index 00000000..e6083ee3
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs
@@ -0,0 +1,547 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Windows.Forms;
+using System.Xml.Linq;
+
+namespace FineUIPro.Web.DCGL.ServerCheck
+{
+ public partial class CheckNotice : PageBase
+ {
+ #region 定义项
+ ///
+ /// 督查检查主键
+ ///
+ public string CheckInfoId
+ {
+ get
+ {
+ return (string)ViewState["CheckInfoId"];
+ }
+ set
+ {
+ ViewState["CheckInfoId"] = value;
+ }
+ }
+ #endregion
+
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ ////权限按钮方法
+ this.InitTreeMenu();
+ this.CheckInfoId = string.Empty;
+ }
+ }
+ #endregion
+
+ #region 加载树
+ ///
+ /// 加载树
+ ///
+ private void InitTreeMenu()
+ {
+ this.tvControlItem.Nodes.Clear();
+ this.tvControlItem.ShowBorder = false;
+ this.tvControlItem.ShowHeader = false;
+ this.tvControlItem.EnableIcons = true;
+ this.tvControlItem.AutoScroll = true;
+ this.tvControlItem.EnableSingleClickExpand = true;
+ TreeNode rootNode = new TreeNode
+ {
+ Text = "检查方式-年月",
+ NodeID = "0",
+ Expanded = true
+ };
+
+ this.tvControlItem.Nodes.Add(rootNode);
+ var checkInfoLists = (from x in Funs.DB.DCGL_Check_CheckInfo select x).ToList();
+ if (!string.IsNullOrEmpty(this.txtCheckStartTimeS.Text))
+ {
+ checkInfoLists = checkInfoLists.Where(x => x.CheckStartTime >= Funs.GetNewDateTime(this.txtCheckStartTimeS.Text)).ToList();
+ }
+ if (!string.IsNullOrEmpty(this.txtCheckEndTimeS.Text))
+ {
+ checkInfoLists = checkInfoLists.Where(x => x.CheckEndTime <= Funs.GetNewDateTime(this.txtCheckEndTimeS.Text)).ToList();
+ }
+
+ var checkTypeList = (from x in checkInfoLists select x.CheckTypeName).Distinct();
+ foreach (var item in checkTypeList)
+ {
+ TreeNode rootUnitNode = new TreeNode
+ {
+ Text = item,
+ NodeID = item,
+ Expanded = true,
+ ToolTip = "检查方式"
+ };//定义根节点
+ rootNode.Nodes.Add(rootUnitNode);
+ var checkInfoList = (from x in checkInfoLists where x.CheckTypeName == item select x).ToList();
+ this.BindNodes(rootUnitNode, checkInfoList);
+ }
+ }
+ #endregion
+
+ #region 绑定树节点
+ ///
+ /// 绑定树节点
+ ///
+ ///
+ private void BindNodes(TreeNode node, List checkInfoList)
+ {
+ if (node.ToolTip == "检查方式")
+ {
+ var pointListMonth = (from x in checkInfoList
+ orderby x.CheckStartTime descending
+ select string.Format("{0:yyyy-MM}", x.CheckStartTime)).Distinct();
+ foreach (var item in pointListMonth)
+ {
+ TreeNode newNode = new TreeNode
+ {
+ Text = item,
+ NodeID = item + "|" + node.NodeID,
+ ToolTip = "月份"
+ };
+ node.Nodes.Add(newNode);
+ this.BindNodes(newNode, checkInfoList);
+ }
+ }
+ else if (node.ToolTip == "月份")
+ {
+ var dReports = from x in checkInfoList
+ where string.Format("{0:yyyy-MM}", x.CheckStartTime) == node.Text
+ orderby x.CheckStartTime descending
+ select x;
+ foreach (var item in dReports)
+ {
+ TreeNode newNode = new TreeNode();
+ var units = BLL.UnitService.GetUnitByUnitId(item.SubjectUnitId);
+ if (units != null)
+ {
+ newNode.Text = (item.CheckStartTime.Day).ToString().PadLeft(2, '0') + "日:" + units.UnitName;
+ }
+ else
+ {
+ newNode.Text = (item.CheckStartTime.Day).ToString().PadLeft(2, '0') + "日:未知单位";
+ }
+ newNode.NodeID = item.CheckInfoId;
+ newNode.EnableClickEvent = true;
+ node.Nodes.Add(newNode);
+ }
+ }
+ }
+ #endregion
+
+ #region 点击TreeView
+ ///
+ /// 点击TreeView
+ ///
+ ///
+ ///
+ protected void tvControlItem_NodeCommand(object sender, TreeCommandEventArgs e)
+ {
+ this.CheckInfoId = this.tvControlItem.SelectedNodeID;
+ this.txtCheckType.Text = this.tvControlItem.SelectedNode.ParentNode.ParentNode.Text;
+ this.PageInfoLoad(); ///页面输入保存信息
+ this.BindGrid1();
+ this.BindGrid2();
+ }
+ #endregion
+
+ #region 加载页面输入保存信息
+ ///
+ /// 加载页面输入保存信息
+ ///
+ private void PageInfoLoad()
+ {
+ var checkInfo = Funs.DB.DCGL_Check_CheckInfo.FirstOrDefault(x => x.CheckInfoId == this.CheckInfoId);
+ if (checkInfo != null)
+ {
+ this.txtCheckStartTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckStartTime);
+ this.txtCheckEndTime.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CheckEndTime);
+ this.drpSubjectUnit.Text = BLL.UnitService.GetUnitNameByUnitId(checkInfo.SubjectUnitId);
+ this.txtCheckType.Text = checkInfo.CheckTypeName;
+ this.txtSubjectUnitMan.Text = checkInfo.SubjectUnitMan;
+ this.txtSubjectUnitAdd.Text = checkInfo.SubjectUnitAdd;
+ this.txtSubjectUnitTel.Text = checkInfo.SubjectUnitTel;
+ this.txtSubjectObject.Text = checkInfo.SubjectObject;
+ this.txtCheckTeamLeader.Text = checkInfo.CheckTeamLeader;
+ this.txtCheckManName.Text = checkInfo.CheckManName;
+ this.txtSupervisionGroupName.Text = checkInfo.SupervisionGroupName;
+ this.txtCompileMan.Text = checkInfo.CompileMan;
+ this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", checkInfo.CompileDate);
+ }
+ else
+ {
+ this.drpSubjectUnit.Text = string.Empty;
+ this.txtSubjectObject.Text = string.Empty;
+ this.txtSubjectUnitMan.Text = string.Empty;
+ this.txtSubjectUnitTel.Text = string.Empty;
+ this.txtSubjectUnitAdd.Text = string.Empty;
+ this.txtCheckStartTime.Text = string.Empty;
+ this.txtCheckEndTime.Text = string.Empty;
+ this.txtCheckType.Text = string.Empty;
+ this.txtCheckTeamLeader.Text = string.Empty;
+ this.txtCheckManName.Text = string.Empty;
+ this.txtSupervisionGroupName.Text = string.Empty;
+ this.txtCompileMan.Text = string.Empty;
+ this.txtCompileDate.Text = string.Empty;
+ this.CheckInfoId = string.Empty;
+ }
+ }
+ #endregion
+
+ #region 数据绑定
+ ///
+ /// 数据绑定
+ ///
+ private void BindGrid1()
+ {
+ string strSql = @"SELECT CheckFileId,CheckInfoId,CheckFileName,SortIndex,Remark FROM dbo.DCGL_Check_CheckInfo_CheckFile WHERE 1=1 ";
+ List listStr = new List();
+ strSql += " AND CheckInfoId = @CheckInfoId";
+ listStr.Add(new SqlParameter("@CheckInfoId", this.CheckInfoId));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ Grid1.RecordCount = tb.Rows.Count;
+ //tb = GetFilteredTable(Grid1.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ }
+
+ ///
+ /// 数据绑定
+ ///
+ private void BindGrid2()
+ {
+ string strSql = @"SELECT CheckTeamId,CheckInfoId,UserName,SexName,SupervisionGroupName,SortIndex,PostName,WorkTitle,CheckPostName,CheckDate
+ FROM dbo.DCGL_Check_CheckInfo_CheckTeam
+ WHERE 1=1 ";
+ List listStr = new List();
+ strSql += " AND CheckInfoId = @CheckInfoId";
+ listStr.Add(new SqlParameter("@CheckInfoId", this.CheckInfoId));
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ Grid2.RecordCount = tb.Rows.Count;
+ //tb = GetFilteredTable(Grid2.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid2, tb);
+ Grid2.DataSource = table;
+ Grid2.DataBind();
+ }
+ #endregion
+
+ #region 排序
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, GridSortEventArgs e)
+ {
+ BindGrid1();
+ }
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid2_Sort(object sender, GridSortEventArgs e)
+ {
+ BindGrid2();
+ }
+ #endregion
+
+ #region 查看检查办法
+ ///
+ /// 查看检查办法
+ ///
+ ///
+ ///
+ protected void btnFind_Click(object sender, EventArgs e)
+ {
+ PageContext.RegisterStartupScript(Window3.GetShowReference(String.Format("CheckInfoTemplate.aspx")));
+ }
+ #endregion
+
+ #region 组面板 折叠展开事件
+ ///
+ /// 组面板 折叠展开事件
+ ///
+ ///
+ ///
+ protected void Gridl_Collapse(object sender, EventArgs e)
+ {
+ if (this.Grid1.Collapsed)
+ {
+ this.Grid2.Collapsed = false;
+ }
+ }
+
+ ///
+ /// 组面板 折叠展开事件
+ ///
+ ///
+ ///
+ protected void Grid2_Collapse(object sender, EventArgs e)
+ {
+ if (this.Grid2.Collapsed)
+ {
+ this.Grid1.Collapsed = false;
+ }
+ }
+
+ ///
+ /// 组面板 折叠展开事件
+ ///
+ ///
+ ///
+ protected void Gridl_Expand(object sender, EventArgs e)
+ {
+ if (this.Grid1.Expanded)
+ {
+ this.Grid2.Expanded = false;
+ }
+ }
+
+ ///
+ /// 组面板 折叠展开事件
+ ///
+ ///
+ ///
+ protected void Grid2_Expand(object sender, EventArgs e)
+ {
+ if (this.Grid2.Expanded)
+ {
+ this.Grid1.Expanded = false;
+ }
+ }
+ #endregion
+
+ ///
+ /// 查询
+ ///
+ ///
+ ///
+ protected void Tree_TextChanged(object sender, EventArgs e)
+ {
+ this.InitTreeMenu();
+ this.BindGrid1();
+ this.BindGrid2();
+ }
+
+ ///
+ /// 从集团获取
+ ///
+ ///
+ ///
+ protected void btnGet_Click(object sender, EventArgs e)
+ {
+ var returnValue = getDCGLCheckInfo_CheckTeam();
+ // var returnValue= CNCECHSSEGetWebService.getCheck_CheckInfo_Table8Item();
+
+ if (returnValue.code == 1)
+ {
+ ShowNotify(returnValue.message, MessageBoxIcon.Success);
+ PageInfoLoad();
+ }
+ else
+ {
+ Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success);
+ }
+ }
+
+ #region 获取
+ ///
+ /// 获取
+ ///
+ ///
+ ///
+ public static Model.ResponeData getDCGLCheckInfo_CheckTeam()
+ {
+ var responeData = new Model.ResponeData();
+ try
+ {
+ string unitId = BLL.Const.UnitId_SEDIN;
+ string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getDCGLCheckInfo_CheckTeam?unitId=" + unitId;
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+
+ var strJosn = APIGetHttpService.Http(baseurl, "GET", contenttype, newToken, null);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ JObject obj = JObject.Parse(strJosn);
+ responeData.code = Funs.GetNewIntOrZero(obj["code"].ToString());
+ responeData.message = obj["message"].ToString();
+ if (responeData.code == 1)
+ {
+ string data = obj["data"].ToString();
+ JArray arr = JArray.Parse(data);
+ if (arr.Count() > 0)
+ {
+ using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+ {
+ List ids = new List();
+ foreach (var item in arr)
+ {
+ string getCheckInfoId = item["CheckInfoId"].ToString();
+ if (!ids.Contains(getCheckInfoId))
+ {
+ var updateCheckInfo = db.DCGL_Check_CheckInfo.FirstOrDefault(x => x.CheckInfoId == getCheckInfoId);
+ if (updateCheckInfo == null)
+ {
+ ids.Add(getCheckInfoId);
+ Model.DCGL_Check_CheckInfo newCheckInfo = new Model.DCGL_Check_CheckInfo
+ {
+ CheckInfoId = getCheckInfoId,
+ CheckTypeName = item["CheckTypeName"].ToString(),
+ SubjectUnitId = item["SubjectUnitId"].ToString(),
+ SubjectUnitAdd = item["SubjectUnitAdd"].ToString(),
+ SubjectUnitMan = item["SubjectUnitMan"].ToString(),
+ SubjectUnitTel = item["SubjectUnitTel"].ToString(),
+ CheckStartTime = Funs.GetNewDateTimeOrNow(item["CheckStartTime"].ToString()),
+ CheckEndTime = Funs.GetNewDateTimeOrNow(item["CheckEndTime"].ToString()),
+ SubjectObject = item["SubjectObject"].ToString(),
+ };
+
+ db.DCGL_Check_CheckInfo.InsertOnSubmit(newCheckInfo);
+ db.SubmitChanges();
+ }
+ else
+ {
+ updateCheckInfo.CheckInfoId = getCheckInfoId;
+ updateCheckInfo.CheckTypeName = item["CheckTypeName"].ToString();
+ updateCheckInfo.SubjectUnitId = item["SubjectUnitId"].ToString();
+ updateCheckInfo.SubjectUnitAdd = item["SubjectUnitAdd"].ToString();
+ updateCheckInfo.SubjectUnitMan = item["SubjectUnitMan"].ToString();
+ updateCheckInfo.SubjectUnitTel = item["SubjectUnitTel"].ToString();
+ updateCheckInfo.CheckStartTime = Funs.GetNewDateTimeOrNow(item["CheckStartTime"].ToString());
+ updateCheckInfo.CheckEndTime = Funs.GetNewDateTimeOrNow(item["CheckEndTime"].ToString());
+ updateCheckInfo.SubjectObject = item["SubjectObject"].ToString();
+ db.SubmitChanges();
+ }
+ }
+
+ //string getCheckItemId = item["CheckItemId"].ToString();
+ //var updateTable8 = db.Check_CheckInfo_Table8.FirstOrDefault(x => x.CheckItemId == getCheckItemId);
+ //if (updateTable8 == null)
+ //{
+ // Model.Check_CheckInfo_Table8 newTable8 = new Model.Check_CheckInfo_Table8
+ // {
+ // CheckItemId = getCheckItemId,
+ // CheckInfoId = getCheckInfoId,
+ // Values1 = item["Values1"].ToString(),
+ // Values2 = item["Values2"].ToString(),
+ // Values3 = item["Values3"].ToString(),
+ // Values4 = item["Values4"].ToString(),
+ // Values5 = item["Values5"].ToString(),
+ // Values6 = item["Values6"].ToString(),
+ // Values7 = item["Values7"].ToString(),
+ // Values8 = item["Values8"].ToString(),
+ // };
+ // db.Check_CheckInfo_Table8.InsertOnSubmit(newTable8);
+ // db.SubmitChanges();
+ //}
+ //else
+ //{
+ // updateTable8.Values1 = item["Values1"].ToString();
+ // updateTable8.Values2 = item["Values2"].ToString();
+ // updateTable8.Values3 = item["Values3"].ToString();
+ // updateTable8.Values4 = item["Values4"].ToString();
+ // updateTable8.Values5 = item["Values5"].ToString();
+ // updateTable8.Values6 = item["Values6"].ToString();
+ // updateTable8.Values7 = item["Values7"].ToString();
+ // updateTable8.Values8 = item["Values8"].ToString();
+ // db.SubmitChanges();
+ //}
+
+ string getCheckTeamId = item["CheckTeamId"].ToString();
+ var checkTeam = db.DCGL_Check_CheckInfo_CheckTeam.FirstOrDefault(x => x.CheckTeamId == getCheckTeamId);
+ if (checkTeam == null)
+ {
+
+ string UserName = item["UserName"].ToString();
+ string SexName = item["SexName"].ToString();
+ //UnitId = item["UnitId"].ToString(),
+ //UnitName = item["UnitName"].ToString(),
+ string SupervisionGroupId = item["SupervisionGroupId"].ToString();
+ string SupervisionGroupName = item["SupervisionGroupName"].ToString();
+ string PostName = item["PostName"].ToString();
+ string WorkTitle = item["WorkTitle"].ToString();
+ string CheckPostName = item["CheckPostName"].ToString();
+ var CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString());
+ var SortIndex = Funs.GetNewInt(item["SortIndex"].ToString());
+
+ Model.DCGL_Check_CheckInfo_CheckTeam newCheckTeam = new Model.DCGL_Check_CheckInfo_CheckTeam
+ {
+ CheckTeamId = getCheckTeamId,
+ CheckInfoId = getCheckInfoId,
+ UserName = item["UserName"].ToString(),
+ SexName = item["SexName"].ToString(),
+ //UnitId = item["UnitId"].ToString(),
+ //UnitName = item["UnitName"].ToString(),
+ SupervisionGroupId = item["SupervisionGroupId"].ToString(),
+ SupervisionGroupName = item["SupervisionGroupName"].ToString(),
+ PostName = item["PostName"].ToString(),
+ WorkTitle = item["WorkTitle"].ToString(),
+ CheckPostName = item["CheckPostName"].ToString(),
+ CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString()),
+ SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()),
+ };
+ db.DCGL_Check_CheckInfo_CheckTeam.InsertOnSubmit(newCheckTeam);
+ db.SubmitChanges();
+ }
+ else
+ {
+ checkTeam.CheckTeamId = getCheckTeamId;
+ checkTeam.CheckInfoId = getCheckInfoId;
+ checkTeam.UserName = item["UserName"].ToString();
+ checkTeam.SexName = item["SexName"].ToString();
+ //checkTeam.UnitId = item["UnitId"].ToString();
+ //checkTeam.UnitName = item["UnitName"].ToString();
+ checkTeam.SupervisionGroupId = item["SupervisionGroupId"].ToString();
+ checkTeam.SupervisionGroupName = item["SupervisionGroupName"].ToString();
+ checkTeam.PostName = item["PostName"].ToString();
+ checkTeam.WorkTitle = item["WorkTitle"].ToString();
+ checkTeam.CheckPostName = item["CheckPostName"].ToString();
+ checkTeam.CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString());
+ checkTeam.SortIndex = Funs.GetNewInt(item["SortIndex"].ToString());
+ db.SubmitChanges();
+ }
+ }
+ responeData.message = "获取成功:记录" + arr.Count().ToString() + "条";
+ }
+ }
+ else { responeData.message = "未获取数据!"; }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ responeData.code = 0;
+ responeData.message = "获取失败:" + ex.Message;
+ ErrLogInfo.WriteLog("督查检查通知单获取!", ex);
+ }
+
+ return responeData;
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.designer.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.designer.cs
new file mode 100644
index 00000000..3c58403b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.designer.cs
@@ -0,0 +1,314 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.DCGL.ServerCheck
+{
+
+
+ public partial class CheckNotice
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// panelLeftRegion 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel panelLeftRegion;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// txtCheckStartTimeS 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtCheckStartTimeS;
+
+ ///
+ /// Toolbar3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar3;
+
+ ///
+ /// txtCheckEndTimeS 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtCheckEndTimeS;
+
+ ///
+ /// tvControlItem 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Tree tvControlItem;
+
+ ///
+ /// panelCenterRegion 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel panelCenterRegion;
+
+ ///
+ /// Toolbar2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar2;
+
+ ///
+ /// btnFind 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnFind;
+
+ ///
+ /// hdCheckInfoId 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox hdCheckInfoId;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnGet 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnGet;
+
+ ///
+ /// SimpleForm1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm1;
+
+ ///
+ /// txtCheckType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtCheckType;
+
+ ///
+ /// temp 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label temp;
+
+ ///
+ /// drpSubjectUnit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label drpSubjectUnit;
+
+ ///
+ /// txtSubjectObject 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtSubjectObject;
+
+ ///
+ /// txtSubjectUnitMan 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtSubjectUnitMan;
+
+ ///
+ /// txtSubjectUnitTel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtSubjectUnitTel;
+
+ ///
+ /// txtSubjectUnitAdd 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtSubjectUnitAdd;
+
+ ///
+ /// txtCheckManName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtCheckManName;
+
+ ///
+ /// txtSupervisionGroupName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtSupervisionGroupName;
+
+ ///
+ /// txtCheckTeamLeader 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtCheckTeamLeader;
+
+ ///
+ /// txtCheckStartTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtCheckStartTime;
+
+ ///
+ /// txtCheckEndTime 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtCheckEndTime;
+
+ ///
+ /// txtCompileMan 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtCompileMan;
+
+ ///
+ /// txtCompileDate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtCompileDate;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Grid2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid2;
+
+ ///
+ /// Window3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window3;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx
new file mode 100644
index 00000000..bd6fe967
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx
@@ -0,0 +1,135 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckRectify.aspx.cs" Inherits="FineUIPro.Web.DCGL.ServerCheck.CheckRectify" %>
+
+
+
+
+
+
+ 督查检查整改
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
new file mode 100644
index 00000000..f3c5aa59
--- /dev/null
+++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs
@@ -0,0 +1,622 @@
+using BLL;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.DCGL.ServerCheck
+{
+ public partial class CheckRectify : PageBase
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.GetButtonPower();
+ //btnNew.OnClientClick = Window1.GetShowReference("CheckRectifyEdit.aspx") + "return false;";
+ ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+ // 绑定表格
+ BindGrid();
+ }
+ }
+
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ string strSql = string.Empty;
+ SqlParameter[] parameter = new SqlParameter[] { };
+ strSql = "SELECT S.CheckRectifyId,S.CheckRectifyCode,S.ProjectId,S.ProjectName,S.UnitId,U.UnitName,S.CheckDate,CASE S.HandleState WHEN '" + BLL.Const.State_1 + "' THEN '未签发' WHEN '" + BLL.Const.State_2 + "' THEN '未上报' ELSE '已上报' END AS HandleState,"
+ + @" S.IssueMan,S.IssueDate,ISNULL(TotalCount.TotalCount,0) AS TotalCount ,ISNULL(CompleteCount.CompleteCount,0) AS CompleteCount,(ISNULL(TotalCount.TotalCount,0) -ISNULL(CompleteCount.CompleteCount,0)) AS UnCompleteCount"
+ + @" FROM dbo.DCGL_Check_CheckRectify AS S LEFT JOIN dbo.Base_Unit AS U ON U.UnitId = S.UnitId"
+ + @" LEFT JOIN (SELECT COUNT(*) AS TotalCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem GROUP BY CheckRectifyId) AS TotalCount ON S.CheckRectifyId=TotalCount.CheckRectifyId"
+ + @" LEFT JOIN (SELECT COUNT(*) AS CompleteCount, CheckRectifyId FROM dbo.DCGL_Check_CheckRectifyItem WHERE RealEndDate IS NOT NULL GROUP BY CheckRectifyId) AS CompleteCount ON S.CheckRectifyId=CompleteCount.CheckRectifyId"
+ + @" ORDER BY HandleState";
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+ // 2.获取当前分页数据
+ //var table = this.GetPagedDataTable(Grid1, tb1);
+
+ Grid1.RecordCount = tb.Rows.Count;
+ //tb = GetFilteredTable(Grid1.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ for (int i = 0; i < Grid1.Rows.Count; i++)
+ {
+ Model.DCGL_Check_CheckRectify rectify = BLL.DCGLCheckRectifyService.GetCheckRectifyByCheckRectifyId(Grid1.Rows[i].DataKeys[0].ToString());
+ if (rectify != null)
+ {
+ if (rectify.HandleState == "1")
+ {
+ Grid1.Rows[i].RowCssClass = "yellow";
+ }
+ else if (rectify.HandleState == "2")
+ {
+ Grid1.Rows[i].RowCssClass = "red";
+ }
+ }
+ }
+ }
+
+ ///
+ /// 分页
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ Grid1.PageIndex = e.NewPageIndex;
+ BindGrid();
+ }
+
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, GridSortEventArgs e)
+ {
+ BindGrid();
+ }
+
+ ///
+ /// 分页显示条数下拉框
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+
+ #region 数据编辑事件
+ ///
+ /// 右键编辑事件
+ ///
+ ///
+ ///
+ protected void btnMenuEdit_Click(object sender, EventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// Grid行双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ this.EditData();
+ }
+ ///
+ /// 编辑数据方法
+ ///
+ private void EditData()
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ string CheckRectifyId = Grid1.SelectedRowID;
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckRectifyEdit.aspx?CheckRectifyId={0}", CheckRectifyId, "编辑 - ")));
+ }
+ #endregion
+
+ ///
+ /// 关闭弹出窗
+ ///
+ ///
+ ///
+ protected void Window1_Close(object sender, WindowCloseEventArgs e)
+ {
+ BindGrid();
+ }
+
+ #region 获取权限按钮
+ ///
+ /// 获取按钮权限
+ ///
+ ///
+ ///
+ private void GetButtonPower()
+ {
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.DCGLCheckRectifyMenuId);
+ if (buttonList.Count > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnModify))
+ {
+ this.btnMenuEdit.Hidden = false;
+ }
+ }
+ }
+ #endregion
+
+ #region 导出按钮
+ /// 导出按钮
+ ///
+ ///
+ ///
+ protected void btnOut_Click(object sender, EventArgs e)
+ {
+ Response.ClearContent();
+ string filename = Funs.GetNewFileName();
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("集团下发督查检查整改" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ Response.Write(GetGridTableHtml(Grid1));
+ Response.End();
+
+ }
+
+ ///
+ /// 导出方法
+ ///
+ ///
+ ///
+ private string GetGridTableHtml(Grid grid)
+ {
+ StringBuilder sb = new StringBuilder();
+ MultiHeaderTable mht = new MultiHeaderTable();
+ mht.ResolveMultiHeaderTable(Grid1.Columns);
+ sb.Append("");
+ sb.Append("");
+ foreach (List
");
+ return sb.ToString();
+ }
+
+ #region 多表头处理
+ ///
+ /// 多表头处理
+ ///
+ public class MultiHeaderTable
+ {
+ // 包含 rowspan,colspan 的多表头,方便生成 HTML 的 table 标签
+ public List> MultiTable = new List>();
+ // 最终渲染的列数组
+ public List Columns = new List();
+ public void ResolveMultiHeaderTable(GridColumnCollection columns)
+ {
+ List