From 6ac63e6695a9d33991d811808ba12f0fbefa8556 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 23 Jan 2025 22:56:48 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9D=A3=E6=9F=A5=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SUBQHSE_V2025-01-10.sql | 7 + .../版本日志/SUBQHSE_V2025-01-22-xiaj.sql | 307 ++ DataBase/版本日志/SUBQHSE_V2025-01-22.sql | 104 + SGGL/BLL/BLL.csproj | 3 + SGGL/BLL/BLL.csproj.user | 2 +- SGGL/BLL/Common/Const.cs | 15 + .../DCGLCheckRectifyItemService.cs | 61 + .../ServerCheck/DCGLCheckRectifyService.cs | 63 + SGGL/BLL/WebService/CNCECHSSEGetWebService.cs | 98 + .../DCGL/ServerCheck/CheckNotice.aspx | 232 ++ .../DCGL/ServerCheck/CheckNotice.aspx.cs | 547 +++ .../ServerCheck/CheckNotice.aspx.designer.cs | 314 ++ .../DCGL/ServerCheck/CheckRectify.aspx | 135 + .../DCGL/ServerCheck/CheckRectify.aspx.cs | 622 ++++ .../ServerCheck/CheckRectify.aspx.designer.cs | 161 + .../DCGL/ServerCheck/CheckRectifyEdit.aspx | 147 + .../DCGL/ServerCheck/CheckRectifyEdit.aspx.cs | 192 + .../CheckRectifyEdit.aspx.designer.cs | 224 ++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 26 +- .../APIItem/CNCEC/DCGLCheckRectifyItem.cs | 295 ++ SGGL/Model/Model.cs | 3308 +++++++++++++++++ SGGL/Model/Model.csproj | 1 + SGGL/WebAPI/WebAPI.csproj.user | 2 +- 23 files changed, 6863 insertions(+), 3 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2025-01-10.sql create mode 100644 DataBase/版本日志/SUBQHSE_V2025-01-22-xiaj.sql create mode 100644 DataBase/版本日志/SUBQHSE_V2025-01-22.sql create mode 100644 SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyItemService.cs create mode 100644 SGGL/BLL/DCGL/ServerCheck/DCGLCheckRectifyService.cs create mode 100644 SGGL/BLL/WebService/CNCECHSSEGetWebService.cs create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckNotice.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.designer.cs create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs create mode 100644 SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs create mode 100644 SGGL/Model/APIItem/CNCEC/DCGLCheckRectifyItem.cs diff --git a/DataBase/版本日志/SUBQHSE_V2025-01-10.sql b/DataBase/版本日志/SUBQHSE_V2025-01-10.sql new file mode 100644 index 00000000..06a2b80c --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-01-10.sql @@ -0,0 +1,7 @@ +alter table dbo.Sys_User + add IsInspectionBrigade bit +go + +exec sp_addextendedproperty 'MS_Description', N'Ƿ񶽲Ա', 'SCHEMA', 'dbo', 'TABLE', 'Sys_User', 'COLUMN', + 'IsInspectionBrigade' +go diff --git a/DataBase/版本日志/SUBQHSE_V2025-01-22-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2025-01-22-xiaj.sql new file mode 100644 index 00000000..2ce1f59d --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-01-22-xiaj.sql @@ -0,0 +1,307 @@ + + +--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] +ALTER TABLE [dbo].[DCGL_Check_CheckInfo] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckInfo_Sys_User] FOREIGN KEY([CheckTeamLeader]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[DCGL_Check_CheckInfo] CHECK CONSTRAINT [FK_DCGL_Check_CheckInfo_Sys_User] +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] +ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckTeam] WITH CHECK ADD CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckTeam_Sys_User] FOREIGN KEY([UserId]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[DCGL_Check_CheckInfo_CheckTeam] CHECK CONSTRAINT [FK_DCGL_Check_CheckInfo_CheckTeam_Sys_User] +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/DataBase/版本日志/SUBQHSE_V2025-01-22.sql b/DataBase/版本日志/SUBQHSE_V2025-01-22.sql new file mode 100644 index 00000000..9225554f --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2025-01-22.sql @@ -0,0 +1,104 @@ +alter view dbo.View_SitePerson_Person as + SELECT Person.PersonId, + Person.CardNo, + Person.PersonName, + Person.Sex, + (Case Person.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, + Person.IdentityCard, + Person.Address, + Person.ProjectId, + Person.UnitId, + Person.Birthday, + Person.TeamGroupId, + Person.WorkAreaId, + Person.WorkPostId, + Person.InTime, + Person.OutTime, + Person.OutResult, + Person.Telephone, + Person.PositionId, + Person.PostTitleId, + Person.PhotoUrl, + Person.IsUsed, + (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName, + Person.IsCardUsed, + (CASE Person.IsCardUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsCardUsedName, + Person.PersonIndex, + Project.ProjectCode, + Project.ProjectName, + Unit.UnitCode, + Unit.UnitName, + TeamGroup.TeamGroupName, + --WorkArea.UnitWorkCode AS WorkAreaCode, + WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode + FROM dbo.WBS_UnitWork + where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%', ',' + Person.WorkAreaId + ',') > 0 + FOR XML PATH('')), 1, 1, ''), + --WorkArea.UnitWorkName AS WorkAreaName + WorkAreaName= STUFF((SELECT ',' + UnitWorkName + FROM dbo.WBS_UnitWork + where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%', ',' + Person.WorkAreaId + ',') > 0 + FOR XML PATH('')), 1, 1, ''), + Post.WorkPostName, + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + Depart.DepartId, + Post.PostType, + Post.IsHsse, + (SELECT COUNT(*) + FROM EduTrain_TrainRecordDetail T + WHERE T.PersonId = Person.PersonId) AS TrainCount, + Person.AuditorId, + sysUser.UserName AS AuditorName, + Person.AuditorDate, + Person.IDCardUrl, + Person.IsForeign, + case when Person.IsForeign = 1 then '' else '' end as IsForeignStr, + Person.IdcardType, + BasicData1.dictName as IdcardTypeName, + Person.IdcardStartDate, + Person.IdcardEndDate, + Person.IdcardForever, + case when Person.IdcardForever = 'Y' then '' else '' end as IdcardForeverStr, + Person.PoliticsStatus, + BasicData2.dictName as PoliticsStatusName, + Person.IdcardAddress, + Person.Nation, + BasicData3.dictName as NationName, + Person.EduLevel, + BasicData4.dictName as EduLevelName, + Person.MaritalStatus, + BasicData5.dictName as MaritalStatusName, + Person.CountryCode, + Country.cname as CountryName, + Person.ProvinceCode, + City.cname as ProvinceName, + Person.MainCNProfessionalId, + CNProfessional.ProfessionalName as MainCNProfessionalName, + Person.ViceCNProfessionalId, + '' as ViceCNProfessionalName, + Person.IsOutside, + case when Person.IsOutside = 1 then '' else '' end as IsOutsideStr + FROM SitePerson_Person AS Person + LEFT JOIN Base_Project AS Project ON Project.ProjectId = Person.ProjectId + LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId + LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId = Person.TeamGroupId +--LEFT JOIN WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Person.WorkAreaId + LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId + LEFT JOIN Base_Position AS Position ON Position.PositionId = Person.PositionId + Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Person.PostTitleId + Left JOIN Base_Depart AS Depart ON Depart.DepartId = Person.DepartId + Left JOIN Sys_User AS sysUser ON sysUser.UserId = Person.AuditorId + Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Person.IdcardType + Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Person.PoliticsStatus + Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Person.Nation + Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Person.EduLevel + Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Person.MaritalStatus + Left JOIN RealName_Country AS Country ON Country.CountryId = Person.CountryCode + Left JOIN RealName_City AS City + ON City.provinceCode = Person.ProvinceCode and Country.countryCode = City.countryId + Left JOIN Base_CNProfessional AS CNProfessional + ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId +go + diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj index e5110069..399763c9 100644 --- a/SGGL/BLL/BLL.csproj +++ b/SGGL/BLL/BLL.csproj @@ -303,6 +303,8 @@ + + @@ -806,6 +808,7 @@ + diff --git a/SGGL/BLL/BLL.csproj.user b/SGGL/BLL/BLL.csproj.user index 9b86104e..c10e84ba 100644 --- a/SGGL/BLL/BLL.csproj.user +++ b/SGGL/BLL/BLL.csproj.user @@ -1,6 +1,6 @@  - ShowAllFiles + ProjectFiles \ No newline at end of file diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 38c97e42..c54e43e0 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -1473,6 +1473,21 @@ namespace BLL public const string CheckInfoReportMenuId = "091D7D24-E706-465A-95FD-8EF359CB8667"; #endregion + + #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 + + #region 绩效评价 /// /// 绩效评价 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/WebService/CNCECHSSEGetWebService.cs b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs new file mode 100644 index 00000000..0872c8cb --- /dev/null +++ b/SGGL/BLL/WebService/CNCECHSSEGetWebService.cs @@ -0,0 +1,98 @@ +using System.Linq; +using System.Timers; +using System.Configuration; +using System; +using Newtonsoft.Json.Linq; +using Newtonsoft.Json; +using System.Collections; + +namespace BLL +{ + public class CNCECHSSEGetWebService + { + + + #region 督查检查整改上报 + /// + /// 督查检查整改上报 + /// + public static string UpDCGlCheck_CheckRectify(string checkRectifyId, Model.Sys_User 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 + + + } +} 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..a7d158c9 --- /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 = CommonService.GetThisUnitId(); + 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..931c3f1e --- /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.UserId, 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 rows in mht.MultiTable) + { + sb.Append(""); + foreach (object[] cell in rows) + { + int rowspan = Convert.ToInt32(cell[0]); + int colspan = Convert.ToInt32(cell[1]); + GridColumn column = cell[2] as GridColumn; + + sb.AppendFormat("{3}", + rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "", + colspan != 1 ? " colspan=\"" + colspan + "\"" : "", + colspan != 1 ? " style=\"text-align:center;\"" : "", + column.HeaderText); + } + sb.Append(""); + } + foreach (GridRow row in grid.Rows) + { + sb.Append(""); + foreach (GridColumn column in mht.Columns) + { + string html = row.Values[column.ColumnIndex].ToString(); + if (column.ColumnID == "tfNumber") + { + html = (row.FindControl("lblNumber") as AspNet.Label).Text; + } + if (column.ColumnID == "UnitName") + { + html = (row.FindControl("lblUnit") as AspNet.Label).Text; + } + if (column.ColumnID == "ProjectName") + { + //html = (row.FindControl("lblProjectId") as AspNet.Label).Text; + html = (row.FindControl("lblProjectName") as AspNet.Label).Text; + } + sb.AppendFormat("", html); + } + sb.Append(""); + } + sb.Append("
{0}
"); + 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 row = new List(); + foreach (GridColumn column in columns) + { + object[] cell = new object[4]; + cell[0] = 1; // rowspan + cell[1] = 1; // colspan + cell[2] = column; + cell[3] = null; + row.Add(cell); + } + ResolveMultiTable(row, 0); + ResolveColumns(row); + } + + private void ResolveColumns(List row) + { + foreach (object[] cell in row) + { + GroupField groupField = cell[2] as GroupField; + if (groupField != null && groupField.Columns.Count > 0) + { + List subrow = new List(); + foreach (GridColumn column in groupField.Columns) + { + subrow.Add(new object[] + { + 1, + 1, + column, + groupField + }); + } + ResolveColumns(subrow); + } + else + { + Columns.Add(cell[2] as GridColumn); + } + } + } + + private void ResolveMultiTable(List row, int level) + { + List nextrow = new List(); + + foreach (object[] cell in row) + { + GroupField groupField = cell[2] as GroupField; + if (groupField != null && groupField.Columns.Count > 0) + { + // 如果当前列包含子列，则更改当前列的 colspan，以及增加父列（向上递归）的colspan + cell[1] = Convert.ToInt32(groupField.Columns.Count); + PlusColspan(level - 1, cell[3] as GridColumn, groupField.Columns.Count - 1); + + foreach (GridColumn column in groupField.Columns) + { + nextrow.Add(new object[] + { + 1, + 1, + column, + groupField + }); + } + } + } + MultiTable.Add(row); + // 如果当前下一行，则增加上一行（向上递归）中没有子列的列的 rowspan + if (nextrow.Count > 0) + { + PlusRowspan(level); + ResolveMultiTable(nextrow, level + 1); + } + } + + private void PlusRowspan(int level) + { + if (level < 0) + { + return; + } + foreach (object[] cells in MultiTable[level]) + { + GroupField groupField = cells[2] as GroupField; + if (groupField != null && groupField.Columns.Count > 0) + { + // ... + } + else + { + cells[0] = Convert.ToInt32(cells[0]) + 1; + } + } + PlusRowspan(level - 1); + } + + private void PlusColspan(int level, GridColumn parent, int plusCount) + { + if (level < 0) + { + return; + } + + foreach (object[] cells in MultiTable[level]) + { + GridColumn column = cells[2] as GridColumn; + if (column == parent) + { + cells[1] = Convert.ToInt32(cells[1]) + plusCount; + + PlusColspan(level - 1, cells[3] as GridColumn, plusCount); + } + } + } + } + #endregion + + #endregion + + /// + /// 从集团获取 + /// + /// + /// + protected void btnGet_Click(object sender, EventArgs e) + { + var returnValue = getCheck_CheckRectifyListToSUB(); + if (returnValue.code == 1) + { + ShowNotify(returnValue.message, MessageBoxIcon.Success); + BindGrid(); + } + else + { + Alert.ShowInTop(returnValue.message, MessageBoxIcon.Success); + } + } + + + #region 获取 + /// + /// 获取 + /// + /// + /// + public static Model.ResponeData getCheck_CheckRectifyListToSUB() + { + var responeData = new Model.ResponeData(); + try + { + string unitId =CommonService.GetThisUnitId(); + string baseurl = SysConstSetService.CNCECPath + "/api/HSSEData/getDCGLCheckRectify?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) + { + JArray getData = JArray.Parse(obj["data"].ToString()); + if (getData.Count() > 0) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + List ids = new List(); + foreach (var item in getData) + { + string getCheckRectifyId = item["CheckRectifyId"].ToString(); + if (!ids.Contains(getCheckRectifyId)) + { + var newRectify = db.DCGL_Check_CheckRectify.FirstOrDefault(e => e.CheckRectifyId == getCheckRectifyId); + if (newRectify == null) + { + ids.Add(getCheckRectifyId); + Model.DCGL_Check_CheckRectify newCheckRectify = new Model.DCGL_Check_CheckRectify + { + CheckRectifyId = getCheckRectifyId, + CheckRectifyCode = item["CheckRectifyCode"].ToString(), + ProjectId = item["ProjectId"].ToString(), + ProjectName = item["ProjectName"].ToString(), + UnitId = unitId, + CheckDate = Funs.GetNewDateTime(item["CheckDate"].ToString()), + IssueMan = item["IssueMan"].ToString(), + IssueDate = Funs.GetNewDateTime(item["IssueDate"].ToString()), + HandleState = item["HandleState"].ToString() + }; + db.DCGL_Check_CheckRectify.InsertOnSubmit(newCheckRectify); + db.SubmitChanges(); + } + else + { + newRectify.CheckRectifyCode = item["CheckRectifyCode"].ToString(); + db.SubmitChanges(); + } + + //获取对应主表主键的明细集合 + string getNoticeItemId = item["NoticeItemId"].ToString(); + var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId); + if (notice == null) + { + Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem + { + ID = getNoticeItemId, + CheckInfoId = item["CheckInfoId"].ToString(), + SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()), + Describe = item["Describe"].ToString(), + Standards = item["Standards"].ToString(), + Advice = item["Advice"].ToString(), + LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()), + + Situation = item["Situation"].ToString(), + Remark = item["Remark"].ToString(), + Url = item["Url"].ToString(), + AffUrl = item["AffUrl"].ToString(), + RiskLevel = item["RiskLevel"].ToString(), + ProblemTypes = item["ProblemTypes"].ToString(), + ProblemSubTypeId = item["ProblemSubTypeId"].ToString(), + ProblemSubType = item["ProblemSubType"].ToString(), + States = item["States"].ToString(), + + //WorkType = item["WorkType"].ToString(), + //DangerPoint = item["DangerPoint"].ToString(), + //RiskExists = item["RiskExists"].ToString(), + //IsProject = Convert.ToBoolean(item["IsProject"].ToString()), + //CheckMan = item["CheckMan"].ToString(), + //SubjectUnitMan = item["SubjectUnitMan"].ToString(), + }; + db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + + BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件 + ////上传附件 + string getAttachFileId = item["AttachFileId"].ToString(); + if (!string.IsNullOrEmpty(getAttachFileId)) + { + JArray byteList = item["FileContext"] as JArray; + List resultList = new List(); + foreach (JToken token in byteList) + { + byte[] byteArray = Convert.FromBase64String(token.ToString()); + resultList.Add(byteArray); + } + + //List fileContext = new List(); + //fileContext.Add(Convert.FromBase64String(item["FileContext"].ToString())); + BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, item["AttachSource"].ToString(), item["AttachUrl"].ToString(), resultList); + } + + string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString(); + var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId); + if (oldItem == null) + { + Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem + { + CheckRectifyItemId = getCheckRectifyItemId, + CheckRectifyId = getCheckRectifyId, + NoticeItemId = getNoticeItemId, + ConfirmMan = item["ConfirmMan"].ToString(), + ConfirmManName = item["ConfirmManName"].ToString(), + ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()), + OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()), + OrderEndPerson = item["OrderEndPerson"].ToString(), + RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()), + }; + + db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + } + else + { + //获取对应主表主键的明细集合 + string getNoticeItemId = item["NoticeItemId"].ToString(); + var notice = db.DCGL_Check_CheckInfo_TableNoticeItem.FirstOrDefault(x => x.ID == getNoticeItemId); + if (notice == null) + { + + Model.DCGL_Check_CheckInfo_TableNoticeItem newCheckRectifyItem = new Model.DCGL_Check_CheckInfo_TableNoticeItem + { + ID = getNoticeItemId, + CheckInfoId = item["CheckInfoId"].ToString(), + SortIndex = Funs.GetNewInt(item["SortIndex"].ToString()), + Describe = item["Describe"].ToString(), + Standards = item["Standards"].ToString(), + Advice = item["Advice"].ToString(), + LimitTime = Funs.GetNewDateTime(item["LimitTime"].ToString()), + + Situation = item["Situation"].ToString(), + Remark = item["Remark"].ToString(), + Url = item["Url"].ToString(), + AffUrl = item["AffUrl"].ToString(), + RiskLevel = item["RiskLevel"].ToString(), + ProblemTypes = item["ProblemTypes"].ToString(), + ProblemSubTypeId = item["ProblemSubTypeId"].ToString(), + ProblemSubType = item["ProblemSubType"].ToString(), + States = item["States"].ToString(), + + //WorkType = item["WorkType"].ToString(), + //DangerPoint = item["DangerPoint"].ToString(), + //RiskExists = item["RiskExists"].ToString(), + //IsProject = Convert.ToBoolean(item["IsProject"].ToString()), + //CheckMan = item["CheckMan"].ToString(), + //SubjectUnitMan = item["SubjectUnitMan"].ToString(), + }; + db.DCGL_Check_CheckInfo_TableNoticeItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + + BLL.CommonService.DeleteAttachFileById(getNoticeItemId);//删除附件 + ////上传附件 + string getAttachFileId = item["AttachFileId"].ToString(); + if (!string.IsNullOrEmpty(getAttachFileId)) + { + JArray byteList = item["FileContext"] as JArray; + List resultList = new List(); + foreach (JToken token in byteList) + { + byte[] byteArray = Convert.FromBase64String(token.ToString()); + resultList.Add(byteArray); + } + + //List fileContext = new List(); + //fileContext.Add(Convert.FromBase64String(item["FileContext"].ToString())); + BLL.FileInsertService.InsertAttachFile(getAttachFileId, getNoticeItemId, item["AttachSource"].ToString(), item["AttachUrl"].ToString(), resultList); + } + + string getCheckRectifyItemId = item["CheckRectifyItemId"].ToString(); + var oldItem = db.DCGL_Check_CheckRectifyItem.FirstOrDefault(e => e.CheckRectifyItemId == getCheckRectifyItemId); + if (oldItem == null) + { + Model.DCGL_Check_CheckRectifyItem newCheckRectifyItem = new Model.DCGL_Check_CheckRectifyItem + { + CheckRectifyItemId = getCheckRectifyItemId, + CheckRectifyId = getCheckRectifyId, + NoticeItemId = getNoticeItemId, + ConfirmMan = item["ConfirmMan"].ToString(), + ConfirmDate = Funs.GetNewDateTime(item["ConfirmDate"].ToString()), + OrderEndDate = Funs.GetNewDateTime(item["OrderEndDate"].ToString()), + OrderEndPerson = item["OrderEndPerson"].ToString(), + RealEndDate = Funs.GetNewDateTime(item["RealEndDate"].ToString()), + }; + + db.DCGL_Check_CheckRectifyItem.InsertOnSubmit(newCheckRectifyItem); + db.SubmitChanges(); + } + } + } + } + } + responeData.message = "获取成功：整改明细记录" + getData.Count().ToString() + "条"; + } + } + } + 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/CheckRectify.aspx.designer.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.designer.cs new file mode 100644 index 00000000..002cc9c5 --- /dev/null +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectify.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DCGL.ServerCheck +{ + + + public partial class CheckRectify + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// btnGet 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnGet; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// lblUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblUnit; + + /// + /// lblProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblProjectName; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; + + /// + /// Menu1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Menu Menu1; + + /// + /// btnMenuEdit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuEdit; + } +} diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx new file mode 100644 index 00000000..cbec1d1f --- /dev/null +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx @@ -0,0 +1,147 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="CheckRectifyEdit.aspx.cs" Async="true" Inherits="FineUIPro.Web.DCGL.ServerCheck.CheckRectifyEdit" %> + + + + + + + 隐患整改单 + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs new file mode 100644 index 00000000..f90af86c --- /dev/null +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs @@ -0,0 +1,192 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using BLL; +using Newtonsoft.Json.Linq; + +namespace FineUIPro.Web.DCGL.ServerCheck +{ + public partial class CheckRectifyEdit : PageBase + { + /// + /// 主键 + /// + public string CheckRectifyId + { + get + { + return (string)ViewState["CheckRectifyId"]; + } + set + { + ViewState["CheckRectifyId"] = value; + } + } + + /// + /// 定义集合 + /// + private static List CheckRectifyItems = new List(); + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.GetButtonPower(); + this.CheckRectifyId = Request.Params["CheckRectifyId"]; + if (!string.IsNullOrEmpty(this.CheckRectifyId)) + { + var rectify = Funs.DB.DCGL_Check_CheckRectify.FirstOrDefault(x => x.CheckRectifyId == this.CheckRectifyId); + if (rectify != null) + { + var unit = BLL.UnitService.GetUnitByUnitId(rectify.UnitId); + if (unit != null) + { + this.lbUnitName.Text = unit.UnitName; + } + + this.lbProjectName.Text = rectify.ProjectName; + this.lbCheckRectifyCode.Text = rectify.CheckRectifyCode; + if (!string.IsNullOrEmpty(rectify.IssueMan)) + { + this.txtIssueMan.Text = rectify.IssueMan; + } + if (rectify.IssueDate.HasValue) + { + this.txtIssueDate.Text = string.Format("{0:yyyy-MM-dd}", rectify.IssueDate); + } + if (rectify.HandleState == BLL.Const.State_3) + { + this.btnSave.Hidden = true; + this.btnSaveUp.Hidden = true; + } + + CheckRectifyItems = (from x in Funs.DB.View_DCGL_CheckRectifyListFromSUB where x.CheckRectifyId == this.CheckRectifyId orderby x.SortIndex select x).ToList(); + Grid1.DataSource = CheckRectifyItems; + Grid1.DataBind(); + //if (CheckRectifyItems.FirstOrDefault(x => x.DangerPoint.Length > 1) == null) + //{ + this.Grid1.Columns[1].Hidden = true; + this.Grid1.Columns[2].Hidden = true; + //} + } + } + } + } + + /// + /// 保存按钮 + /// + /// + /// + protected void btnSave_Click(object sender, EventArgs e) + { + this.SavaData(BLL.Const.BtnSave); + } + + /// + /// 保存并提交 + /// + /// + /// + protected void btnSaveUp_Click(object sender, EventArgs e) + { + this.SavaData(BLL.Const.BtnSaveUp); + } + + /// + /// 保存数据方法 + /// + /// + private void SavaData(string type) + { + jerqueSaveList(); + foreach (var item in CheckRectifyItems) + { + var newCheckRectifyItem = BLL.DCGLCheckRectifyItemService.GetCheckRectifyItemByCheckRectifyItemId(item.CheckRectifyItemId); + if (newCheckRectifyItem != null) + { + newCheckRectifyItem.RealEndDate = item.RealEndDate; + newCheckRectifyItem.OrderEndPerson = item.OrderEndPerson; + newCheckRectifyItem.Verification = item.Verification; + BLL.DCGLCheckRectifyItemService.UpdateCheckRectifyItem(newCheckRectifyItem); + } + } + + var newCheckRectify = BLL.DCGLCheckRectifyService.GetCheckRectifyByCheckRectifyId(this.CheckRectifyId); + if (newCheckRectify != null && newCheckRectify.HandleState != BLL.Const.State_3) + { + newCheckRectify.HandleState = BLL.Const.State_2; //待上报 + BLL.DCGLCheckRectifyService.UpdateCheckRectify(newCheckRectify); + } + if (type == BLL.Const.BtnSaveUp) + { + string code = CNCECHSSEGetWebService.UpDCGlCheck_CheckRectify(newCheckRectify.CheckRectifyId, this.CurrUser); + if (code == "1") + { + ShowNotify("同步成功！", MessageBoxIcon.Success); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + return; + } + else + { + Alert.ShowInParent("同步异常，请退出后重试！", MessageBoxIcon.Error); + } + } + + BLL.LogService.AddSys_Log(this.CurrUser, string.Empty, string.Empty, BLL.Const.DCGLCheckRectifyMenuId, BLL.Const.BtnModify); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + /// + /// 保存集合 + /// + private void jerqueSaveList() + { + JArray mergedData = Grid1.GetMergedData(); + foreach (JObject mergedRow in mergedData) + { + string status = mergedRow.Value("status"); + JObject values = mergedRow.Value("values"); + string checkRectifyItemId = values.Value("CheckRectifyItemId").ToString(); + var item = CheckRectifyItems.FirstOrDefault(e => e.CheckRectifyItemId == checkRectifyItemId); + if (item != null) + { + item.OrderEndPerson = values.Value("OrderEndPerson").ToString(); + item.RealEndDate = Funs.GetNewDateTime(values.Value("RealEndDate").ToString()); + item.Verification = values.Value("Verification").ToString(); + } + } + } + + #region 权限设置 + /// + /// 权限按钮设置 + /// + private void GetButtonPower() + { + var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.DCGLCheckRectifyMenuId); + if (buttonList.Count() > 0) + { + if (buttonList.Contains(BLL.Const.BtnSave)) + { + this.btnSave.Hidden = false; + this.btnSaveUp.Hidden = false; + } + } + } + #endregion + + #region 关闭按钮事件 + /// + /// 关闭按钮事件 + /// + /// + /// + protected void btnClose_Click(object sender, EventArgs e) + { + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + #endregion + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs new file mode 100644 index 00000000..8c809f64 --- /dev/null +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.designer.cs @@ -0,0 +1,224 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.DCGL.ServerCheck +{ + + + public partial class CheckRectifyEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// Panel4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel4; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// lbUnitName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbUnitName; + + /// + /// lbProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbProjectName; + + /// + /// Panel5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel5; + + /// + /// Label1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label Label1; + + /// + /// lbCheckRectifyCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbCheckRectifyCode; + + /// + /// txtIssueMan 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtIssueMan; + + /// + /// txtIssueDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtIssueDate; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Label15 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label15; + + /// + /// Label4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label Label4; + + /// + /// txtOrderEndPerson 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOrderEndPerson; + + /// + /// txtRealEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtRealEndDate; + + /// + /// txtVerification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtVerification; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnSaveUp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSaveUp; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; + } +} diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index cb1702d7..d84e1613 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -676,6 +676,9 @@ + + + @@ -9181,6 +9184,27 @@ WorkingHoursItem.aspx + + CheckNotice.aspx + ASPXCodeBehind + + + CheckNotice.aspx + + + CheckRectify.aspx + ASPXCodeBehind + + + CheckRectify.aspx + + + CheckRectifyEdit.aspx + ASPXCodeBehind + + + CheckRectifyEdit.aspx + HSEDataCollect.aspx ASPXCodeBehind @@ -19333,7 +19357,7 @@ - +