diff --git a/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql new file mode 100644 index 0000000..37933ea --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-02-13-xiaj.sql @@ -0,0 +1,306 @@ + +/**************************************˵***************************************************************/ + +--1Ŀزֲ˵ +update Sys_Menu +set IsUsed=0 +where MenuType='Menu_ProjectSet' and MenuName in ('Ŀſ','Ŀ','Ŀ״̬','Ŀ') + +--2ĿԱԭȫزֲ˵ +update Sys_Menu +set IsUsed=0 +where MenuType='Menu_HSSE' and MenuName in ('Ŀ߻','ѵ','HSE','ҵ','HSE','','ʩ','HSE','ӦϢ','','¹ʹ','ְҵ','','Ч۹','Ϣ') + +--3˾Դ⣨ԭģزֲ˵ +update Sys_Menu +set IsUsed=0 +where MenuType='Menu_DigData' and SuperMenu='6A992AB8-A32D-448F-B06F-8DD4C112CC91' and MenuName in ('Դ','ȹԴ') + +/**************************************˵***************************************************************/ + +--Ա-HSEЧ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '89451997-E575-4845-BF8A-444E9CA6A962') +BEGIN + --HSEЧ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('89451997-E575-4845-BF8A-444E9CA6A962','HSEЧ','',120,'0','Menu_HSSE',0,0,1) +END +GO + +--HSEЧ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '9667D2CB-8AAE-4799-8C94-A051F9846ECE') +BEGIN + --һһ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('AE58F042-DDAA-4980-A3E8-9A1F36349E45','ԱHSEϢ','HSSE/Examine/OnePersonPerFile.aspx',0,'89451997-E575-4845-BF8A-444E9CA6A962','Menu_HSSE',1,1) + --˼ӷ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('6957A732-BA33-499E-AB32-DB1F73BEA8CE','˼ӷ','HSSE/Examine/BonusScoreSituation.aspx',1,'89451997-E575-4845-BF8A-444E9CA6A962','Menu_HSSE',1,1) + --˿۷ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('0BCE76EA-319F-47BF-913A-A32735641F5C','˿۷','HSSE/Examine/MinusScoreSituation.aspx',2,'89451997-E575-4845-BF8A-444E9CA6A962','Menu_HSSE',1,1) + --ӷ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('9667D2CB-8AAE-4799-8C94-A051F9846ECE','ӷ','HSSE/Examine/BonusScoreSelfManagement.aspx',3,'89451997-E575-4845-BF8A-444E9CA6A962','Menu_HSSE',1,1) + --ӷ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('8526FC57-F2A8-483F-A7EF-724785B9B676','ӷ','HSSE/Examine/BonusScoreType.aspx',100,'89451997-E575-4845-BF8A-444E9CA6A962','Menu_HSSE',1,1) +END +GO +DELETE FROM Sys_Menu WHERE MenuId in( '5049BB69-A75F-47D4-ABF3-DAA719D05C74','D3BADACC-3DA6-4B09-8BD0-1E2DF7B04B6E','05F4AC73-1BA2-4FF2-AAED-292DF5E44412','7DD00BEF-821D-4996-ADF8-695139F201B4','D5FC7B12-0E81-482C-8B29-A9F43DF05D1F') + +DELETE FROM Sys_ButtonToMenu WHERE MenuId in( '5049BB69-A75F-47D4-ABF3-DAA719D05C74','D3BADACC-3DA6-4B09-8BD0-1E2DF7B04B6E','05F4AC73-1BA2-4FF2-AAED-292DF5E44412','7DD00BEF-821D-4996-ADF8-695139F201B4','D5FC7B12-0E81-482C-8B29-A9F43DF05D1F') + +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = 'AE58F042-DDAA-4980-A3E8-9A1F36349E45') +BEGIN + --ԱHSEϢ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('4588FFE3-75FD-42A7-979C-6065857D1D8E','AE58F042-DDAA-4980-A3E8-9A1F36349E45','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F049D5EB-C233-479B-A11C-EC8943898A5A','AE58F042-DDAA-4980-A3E8-9A1F36349E45','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('926D7FF6-446B-4946-ADF4-8CF76F65FDA0','AE58F042-DDAA-4980-A3E8-9A1F36349E45','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('70AB520C-B6EA-4D9F-A94E-AE56D2CD6829','AE58F042-DDAA-4980-A3E8-9A1F36349E45','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '6957A732-BA33-499E-AB32-DB1F73BEA8CE') +BEGIN + --˼ӷ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('14DD87C3-2B71-42F6-A1EE-AA2B138583C0','6957A732-BA33-499E-AB32-DB1F73BEA8CE','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('5A35CA7F-A244-4C02-BE26-EE6F14ACF443','6957A732-BA33-499E-AB32-DB1F73BEA8CE','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('0BD10961-0490-4130-B288-58253A52492F','6957A732-BA33-499E-AB32-DB1F73BEA8CE','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('DCE4B049-B421-4C32-AA2A-2A4E099E1441','6957A732-BA33-499E-AB32-DB1F73BEA8CE','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '8526FC57-F2A8-483F-A7EF-724785B9B676') +BEGIN + --ӷ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('186FB2FE-E5DC-4DE6-AE85-82601C6CD128','8526FC57-F2A8-483F-A7EF-724785B9B676','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D75AB4D5-D8E0-43FB-A4C2-3E28E52640A3','8526FC57-F2A8-483F-A7EF-724785B9B676','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('4D8357DA-3875-4EAB-96E7-80874E2C9E72','8526FC57-F2A8-483F-A7EF-724785B9B676','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('74DF5644-CD71-46AF-8E17-EE7BD8A2E579','8526FC57-F2A8-483F-A7EF-724785B9B676','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '9667D2CB-8AAE-4799-8C94-A051F9846ECE') +BEGIN + --ӷ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('000A444E-33C0-486D-8AE9-83312C8FD7B6','9667D2CB-8AAE-4799-8C94-A051F9846ECE','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('37DF7EAC-51A0-48F0-8706-7B7F4F42BC5E','9667D2CB-8AAE-4799-8C94-A051F9846ECE','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('43280BEC-8DD0-45A2-AC79-0454E17A795E','9667D2CB-8AAE-4799-8C94-A051F9846ECE','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('AEDA614E-4A1F-48B8-86AE-69A8C5190BE5','9667D2CB-8AAE-4799-8C94-A051F9846ECE','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '0BCE76EA-319F-47BF-913A-A32735641F5C') +BEGIN + --˿۷ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('61B22424-2AC8-4E34-A783-2C3A8CF9F840','0BCE76EA-319F-47BF-913A-A32735641F5C','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C2A94DCA-2410-46CF-BF1C-16A67ECBAA82','0BCE76EA-319F-47BF-913A-A32735641F5C','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('7587CD81-B7CA-40BD-AB80-31C9CC9D099B','0BCE76EA-319F-47BF-913A-A32735641F5C','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('E1FA46F3-16AD-4490-88AD-78CEF5C6EEB5','0BCE76EA-319F-47BF-913A-A32735641F5C','',4) +END +GO + + +/**************************************ݱ***************************************************************/ + + +--˼ӷ + +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_BonusScoreSituation') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[Examine_BonusScoreSituation]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Level] [nvarchar](200) NULL, + [LevelName] [nvarchar](200) NULL, + [Score] [int] NOT NULL, + [UserId] [nvarchar](50) NULL, + [DateTime] [datetime] NULL, + [Content] [nvarchar](1000) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_Examine_BonusScoreSituation] 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] +ALTER TABLE [dbo].[Examine_BonusScoreSituation] WITH CHECK ADD CONSTRAINT [FK_Examine_BonusScoreSituation_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +ALTER TABLE [dbo].[Examine_BonusScoreSituation] CHECK CONSTRAINT [FK_Examine_BonusScoreSituation_Base_Project] +ALTER TABLE [dbo].[Examine_BonusScoreSituation] WITH CHECK ADD CONSTRAINT [FK_Examine_BonusScoreSituation_User] FOREIGN KEY([UserId]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[Examine_BonusScoreSituation] CHECK CONSTRAINT [FK_Examine_BonusScoreSituation_User] +ALTER TABLE [dbo].[Examine_BonusScoreSituation] WITH CHECK ADD CONSTRAINT [FK_Examine_BonusScoreSituation_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[Examine_BonusScoreSituation] CHECK CONSTRAINT [FK_Examine_BonusScoreSituation_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @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'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'Level' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'LevelName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'Score' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @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'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'DateTime' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'Content' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @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'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˼ӷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSituation' +END + +GO + + +--ӷ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_BonusScoreSelfManagement') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[Examine_BonusScoreSelfManagement]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [BonusScoreTypeId] [nvarchar](50) NULL, + [BonusScoreTypeName] [nvarchar](100) NOT NULL, + [Score] [int] NOT NULL, + [PersonId] [nvarchar](50) NULL, + [Content] [nvarchar](1000) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_Examine_BonusScoreSelfManagement] 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] +ALTER TABLE [dbo].[Examine_BonusScoreSelfManagement] WITH CHECK ADD CONSTRAINT [FK_Examine_BonusScoreSelfManagement_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +ALTER TABLE [dbo].[Examine_BonusScoreSelfManagement] CHECK CONSTRAINT [FK_Examine_BonusScoreSelfManagement_Base_Project] +ALTER TABLE [dbo].[Examine_BonusScoreSelfManagement] WITH CHECK ADD CONSTRAINT [FK_Examine_BonusScoreSelfManagement_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[Examine_BonusScoreSelfManagement] CHECK CONSTRAINT [FK_Examine_BonusScoreSelfManagement_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @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'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӷId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'BonusScoreTypeId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'BonusScoreTypeName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'Score' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'PersonId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'Content' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @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'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreSelfManagement' +END + +GO + +--ӷ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_BonusScoreType') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[Examine_BonusScoreType]( + [Id] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Score] [int] NOT NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_Examine_BonusScoreType] 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] +ALTER TABLE [dbo].[Examine_BonusScoreType] WITH CHECK ADD CONSTRAINT [FK_Examine_BonusScoreType_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[Examine_BonusScoreType] CHECK CONSTRAINT [FK_Examine_BonusScoreType_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreType', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreType', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreType', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreType', @level2type=N'COLUMN',@level2name=N'Score' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreType', @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'Examine_BonusScoreType', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreType', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_BonusScoreType' +END + + +--˿۷ + +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Examine_MinusScoreSituation') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[Examine_MinusScoreSituation]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Level] [nvarchar](200) NULL, + [LevelName] [nvarchar](200) NULL, + [Score] [int] NOT NULL, + [UserId] [nvarchar](50) NULL, + [DateTime] [datetime] NULL, + [Content] [nvarchar](1000) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_Examine_MinusScoreSituation] 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] +ALTER TABLE [dbo].[Examine_MinusScoreSituation] WITH CHECK ADD CONSTRAINT [FK_Examine_MinusScoreSituation_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +ALTER TABLE [dbo].[Examine_MinusScoreSituation] CHECK CONSTRAINT [FK_Examine_MinusScoreSituation_Base_Project] +ALTER TABLE [dbo].[Examine_MinusScoreSituation] WITH CHECK ADD CONSTRAINT [FK_Examine_MinusScoreSituation_User] FOREIGN KEY([UserId]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[Examine_MinusScoreSituation] CHECK CONSTRAINT [FK_Examine_MinusScoreSituation_User] +ALTER TABLE [dbo].[Examine_MinusScoreSituation] WITH CHECK ADD CONSTRAINT [FK_Examine_MinusScoreSituation_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[Examine_MinusScoreSituation] CHECK CONSTRAINT [FK_Examine_MinusScoreSituation_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @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'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'Level' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'LevelName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'Score' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @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'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'DateTime' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'Content' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @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'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˿۷' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Examine_MinusScoreSituation' +END + +GO + + + + diff --git a/DataBase/版本日志/SGGLDB_V2025-02-15-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-02-15-xiaj.sql new file mode 100644 index 0000000..729712c --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-02-15-xiaj.sql @@ -0,0 +1,145 @@ + +--View_SitePerson_PersonList + +ALTER VIEW [dbo].[View_SitePerson_PersonList] +AS + +SELECT + Person.PersonId, + Person.ProjectId, + Person.IsUsed, + Person.IsForeign, + Person.IsOutside, + Person.BlackList, + Person.CardNo, + Person.PersonName, + Person.UnitId, + Unit.UnitName, + Post.WorkPostName, + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + TeamGroup.TeamGroupName, + Person.InTime, + Person.OutTime, + (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName, + Person.IdentityCard, + Person.TeamGroupId, + Person.WorkPostId, + Person.IdcardType, + Person.PhotoUrl, + edu.TrainCount, + PoliticsStatus.dictName AS PoliticsStatusName +FROM SitePerson_Person AS Person +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId +LEFT JOIN RealName_BasicData AS PoliticsStatus ON PoliticsStatus.dictCode = Person.PoliticsStatus AND PoliticsStatus.DictTypeCode='POLITICAL_LANDSCAPE' +LEFT JOIN (select PersonId,count(PersonId)as TrainCount from EduTrain_TrainRecordDetail group by PersonId) as edu on edu.PersonId= Person.PersonId + + + +GO + + + + +--Weld_RecycleMat + +SET QUOTED_IDENTIFIER ON +GO + +CREATE TABLE [dbo].[Weld_RecycleMat]( + [RecycleMatId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [Jot_ID] [nvarchar](50) NULL, + [WeldId] [nvarchar](50) NULL, + [UsingMatId] [nvarchar](50) NULL, + [UsingPlanId] [nvarchar](50) NULL, + [RecycleAmount] [numeric](9, 3) NULL, + [UsingAmount] [numeric](9, 3) NULL, + [RecycleMan] [nvarchar](50) NULL, + [RecycleDate] [datetime] NULL, + [StockMan] [nvarchar](50) NULL, + [Warrantybook] [nvarchar](50) NULL, + [Number] [nvarchar](50) NULL, + [IsWelderConfirm] [bit] NULL, + [IsStoreManConfirm] [bit] NULL, + [ReturnMat] [numeric](9, 3) NULL, + [ReturnMatTop] [int] NULL, + [UsePosition] [nvarchar](50) NULL, + CONSTRAINT [PK_Weld_RecycleMat] PRIMARY KEY CLUSTERED +( + [RecycleMatId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +ALTER TABLE [dbo].[Weld_RecycleMat] WITH CHECK ADD CONSTRAINT [FK_Weld_RecycleMat_Weld_RecycleMat] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[Weld_RecycleMat] CHECK CONSTRAINT [FK_Weld_RecycleMat_Weld_RecycleMat] +GO + +ALTER TABLE [dbo].[Weld_RecycleMat] WITH CHECK ADD CONSTRAINT [FK_Weld_RecycleMat_Weld_UsingMat] FOREIGN KEY([UsingMatId]) +REFERENCES [dbo].[Weld_UsingMat] ([UsingMatId]) +GO + +ALTER TABLE [dbo].[Weld_RecycleMat] CHECK CONSTRAINT [FK_Weld_RecycleMat_Weld_UsingMat] +GO + +ALTER TABLE [dbo].[Weld_RecycleMat] WITH CHECK ADD CONSTRAINT [FK_Weld_RecycleMat_Weld_UsingPlan] FOREIGN KEY([UsingPlanId]) +REFERENCES [dbo].[Weld_UsingPlan] ([UsingPlanId]) +GO + +ALTER TABLE [dbo].[Weld_RecycleMat] CHECK CONSTRAINT [FK_Weld_RecycleMat_Weld_UsingPlan] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'RecycleMatId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'Jot_ID' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'WeldId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'IDǴЩ˻أ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'UsingMatId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'üƻID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'UsingPlanId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'RecycleAmount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'UsingAmount' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˻' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'RecycleMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˻' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'RecycleDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աȷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'StockMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'Warrantybook' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ˮ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'Number' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'IsWelderConfirm' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աȷ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat', @level2type=N'COLUMN',@level2name=N'IsStoreManConfirm' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ļձ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Weld_RecycleMat' +GO + + diff --git a/DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql b/DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql new file mode 100644 index 0000000..9a37d09 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-02-17-xiaj（岗位培训模块）.sql @@ -0,0 +1,667 @@ + + +--λѵ + +/*******************************λѵ˵******************************************************************************************/ + +--Ա-Աѵ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'BEA50D7C-60FE-488B-8D7D-255020EEB4C2') +BEGIN + --Աѵ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Աѵ','',90,'0','Menu_HSSE',0,0,1) +END +GO + +--λѵ +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = 'CEF2A108-DDC2-46A2-A47B-7431F1F890F1') +BEGIN + --λѵ¼ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('CEF2A108-DDC2-46A2-A47B-7431F1F890F1','λѵ¼','HSSE/PostTraining/Record.aspx',10,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1) + --λѵ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('465786B2-AD20-483A-A082-B2C944BE998F','λѵ','HSSE/PostTraining/Category.aspx',100,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1) + --λѵγ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('95D9ABD4-4E58-4BAE-AFE1-7F31EF4DF467','λѵγ','HSSE/PostTraining/Course.aspx',110,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1) + --λѵ׼ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('7BCA5AD9-D0FB-4850-A9D1-88364008984D','λѵ׼','HSSE/PostTraining/Standard.aspx',120,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1) + ----λѵɫ + --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + --VALUES('50F80CAF-08BA-4A16-9EF8-76DF0A8078CF','λѵɫ','HSSE/PostTraining/Role.aspx',130,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1) + --λѵʽ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('919853EB-A8FA-4BE5-9964-70F43E000961','λѵʽ','HSSE/PostTraining/Method.aspx',140,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1) + --λѵ + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsEnd,IsUsed) + VALUES('026F0A23-AECD-4BB8-8504-1EB8CB9151C0','λѵ','HSSE/PostTraining/Teachers.aspx',150,'BEA50D7C-60FE-488B-8D7D-255020EEB4C2','Menu_HSSE',1,1) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = 'CEF2A108-DDC2-46A2-A47B-7431F1F890F1') +BEGIN + --λѵ¼ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D35FC243-EAB1-47DF-9590-7E9403F969F9','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('3121AEDD-C697-4B70-ADB4-619B17636888','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D517703B-3232-4296-892E-944372715424','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('E927076D-EC0E-44D5-816A-99A401D7051C','CEF2A108-DDC2-46A2-A47B-7431F1F890F1','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '465786B2-AD20-483A-A082-B2C944BE998F') +BEGIN + --λѵ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('00C1E0D6-52D2-434D-91D3-78F4DEC1D2ED','465786B2-AD20-483A-A082-B2C944BE998F','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('4E3D31DF-9846-4867-8A11-0FDBBFC9D54F','465786B2-AD20-483A-A082-B2C944BE998F','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('6C1E4EF0-CD74-4236-AB93-4856EE0B367F','465786B2-AD20-483A-A082-B2C944BE998F','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('F2FE3B94-6827-4EF9-B0E8-D34F91054630','465786B2-AD20-483A-A082-B2C944BE998F','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '95D9ABD4-4E58-4BAE-AFE1-7F31EF4DF467') +BEGIN + --λѵγ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('2D24F443-898F-484D-B88D-41D1B8FF6D44','95D9ABD4-4E58-4BAE-AFE1-7F31EF4DF467','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('EEBDFFA2-CC58-48C5-A4F6-91BECA90FEC7','95D9ABD4-4E58-4BAE-AFE1-7F31EF4DF467','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('AB52A4F2-D384-4599-8E99-2C3AE4641C71','95D9ABD4-4E58-4BAE-AFE1-7F31EF4DF467','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('767C4D8E-6A50-4221-8A60-E0CD6E5E8F96','95D9ABD4-4E58-4BAE-AFE1-7F31EF4DF467','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '7BCA5AD9-D0FB-4850-A9D1-88364008984D') +BEGIN + --λѵ׼ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('18AAE15C-6210-4E39-AC08-FAB006AA4DA5','7BCA5AD9-D0FB-4850-A9D1-88364008984D','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('B6BAFF4C-3C70-4838-863D-04156CF39507','7BCA5AD9-D0FB-4850-A9D1-88364008984D','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('875D7BDE-5010-4835-A06E-3AC7DA622074','7BCA5AD9-D0FB-4850-A9D1-88364008984D','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('CC75D488-288C-4883-9452-617818AD5A84','7BCA5AD9-D0FB-4850-A9D1-88364008984D','',4) +END +GO +--IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '50F80CAF-08BA-4A16-9EF8-76DF0A8078CF') +--BEGIN +-- --λѵɫ +-- INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +-- VALUES('93D2A0CB-1388-4059-9C28-8DEDCAD56093','50F80CAF-08BA-4A16-9EF8-76DF0A8078CF','',1) +-- INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +-- VALUES('E3A54064-7D8B-49D8-AE32-89EF002A6D0E','50F80CAF-08BA-4A16-9EF8-76DF0A8078CF','޸',2) +-- INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +-- VALUES('BF0EA069-3B5A-4685-92AC-0AD13AF81010','50F80CAF-08BA-4A16-9EF8-76DF0A8078CF','ɾ',3) +-- INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +-- VALUES('7C57B206-FC52-4622-A276-50FA49691532','50F80CAF-08BA-4A16-9EF8-76DF0A8078CF','',4) +--END +--GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '919853EB-A8FA-4BE5-9964-70F43E000961') +BEGIN + --λѵʽ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('590947CC-0956-496D-A5E9-B888B5B326E3','919853EB-A8FA-4BE5-9964-70F43E000961','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('19400C8D-B5A9-44B9-8345-EF858B0E8B7F','919853EB-A8FA-4BE5-9964-70F43E000961','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('EFDF9021-17D8-414F-B402-3181AD5AAF7C','919853EB-A8FA-4BE5-9964-70F43E000961','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('B038C6EA-6321-44FF-B167-71D075ACEBC3','919853EB-A8FA-4BE5-9964-70F43E000961','',4) +END +GO +IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '026F0A23-AECD-4BB8-8504-1EB8CB9151C0') +BEGIN + --λѵ + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('D83CF41C-F418-419F-ADF1-1509B6F9F83E','026F0A23-AECD-4BB8-8504-1EB8CB9151C0','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('AB78F0DE-84ED-4907-8047-BA29EF86BE1E','026F0A23-AECD-4BB8-8504-1EB8CB9151C0F','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('49D5178F-9AB6-45E1-904A-0E28C0F509D2','026F0A23-AECD-4BB8-8504-1EB8CB9151C0','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('5797B84F-556D-44C8-9261-3EE857E350DA','026F0A23-AECD-4BB8-8504-1EB8CB9151C0','',4) +END +GO + +----1ûѵλId +--IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SitePerson_Person' AND COLUMN_NAME = 'PostTrainingRoleId') +--BEGIN +-- ALTER TABLE SitePerson_Person ADD PostTrainingRoleId nvarchar(50); +--END +--GO + + + +/*******************************λѵݱ******************************************************************************************/ + +--λѵ¼ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Record') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Record]( + [Id] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Content] [nvarchar](500) NULL, + [CategoryId] [nvarchar](50) NULL, + [CategoryName] [nvarchar](200) NULL, + [CourseId] [nvarchar](50) NOT NULL, + [CourseName] [nvarchar](200) NULL, + [Location] [nvarchar](200) NULL, + [Method] [nvarchar](200) NULL, + [Lecturer] [nvarchar](200) NULL, + [UnitIds] [nvarchar](max) NULL, + [WorkPostIds] [nvarchar](max) NULL, + [PersonNum] [int] NOT NULL, + [TrainingTime] [datetime] NOT NULL, + [Duration] [decimal](10, 2) NOT NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_PostTraining_Record] 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] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_Base_Project] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_PostTraining_Category] FOREIGN KEY([CategoryId]) +REFERENCES [dbo].[PostTraining_Category] ([Id]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_PostTraining_Category] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_PostTraining_Course] FOREIGN KEY([CourseId]) +REFERENCES [dbo].[PostTraining_Course] ([Id]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_PostTraining_Course] +ALTER TABLE [dbo].[PostTraining_Record] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[PostTraining_Record] CHECK CONSTRAINT [FK_PostTraining_Record_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @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'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Content' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CategoryId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CategoryName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'γId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CourseId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'γ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CourseName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Location' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Method' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Lecturer' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'UnitIds' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'RoleIds' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'PersonNum' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'TrainingTime' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѧʱСʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'Duration' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @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'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵγ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record' +END + +GO + + +--λѵԱ¼ϸ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Record_Detail') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Record_Detail]( + [Id] [nvarchar](50) NOT NULL, + [RecordId] [nvarchar](50) NULL, + [PersonId] [nvarchar](50) NULL + CONSTRAINT [PK_PostTraining_Record_Detail] 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] +ALTER TABLE [dbo].[PostTraining_Record_Detail] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Record_Detail_PostTraining_Record] FOREIGN KEY([RecordId]) +REFERENCES [dbo].[PostTraining_Record] ([Id]) +ALTER TABLE [dbo].[PostTraining_Record_Detail] CHECK CONSTRAINT [FK_PostTraining_Record_Detail_PostTraining_Record] + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ¼Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail', @level2type=N'COLUMN',@level2name=N'RecordId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵԱId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail', @level2type=N'COLUMN',@level2name=N'PersonId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵԱ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Record_Detail' +END + +GO + +--λѵ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Category') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Category]( + [Id] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_PostTraining_Category] 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] +ALTER TABLE [dbo].[PostTraining_Category] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Category_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[PostTraining_Category] CHECK CONSTRAINT [FK_PostTraining_Category_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Category', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Category', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Category', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Category', @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'PostTraining_Category', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Category', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Category' +END + +GO +--λѵ +IF NOT EXISTS (SELECT * FROM PostTraining_Category) +BEGIN + INSERT INTO PostTraining_Category(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('c106f9ea-d7d9-4ddb-b88a-ed5fb0ad263f','001','ͨðȫ֪ʶ','ͨðȫ֪ʶ',getdate(),null); + INSERT INTO PostTraining_Category(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('aa858051-fcef-4d4d-a288-1b589eb3f750','002','λ','λ',getdate(),null); + INSERT INTO PostTraining_Category(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('b3bcf59b-e4cf-44f8-afe7-35f9295dd25b','003','ܿع','ܿع',getdate(),null); + INSERT INTO PostTraining_Category(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('7f9083a6-9be3-43f3-966f-53addb5d9e1d','004','HSE֪ʶ','HSE֪ʶ',getdate(),null); +END +GO + +--drop table PostTraining_Role +----λѵɫ +--IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Role') AND type = N'U') +--BEGIN + +--CREATE TABLE [dbo].[PostTraining_Role]( +-- [Id] [nvarchar](50) NOT NULL, +-- [Code] [nvarchar](50) NULL, +-- [Name] [nvarchar](200) NULL, +-- [Remark] [nvarchar](1000) NULL, +-- [CompileDate] [datetime] NULL, +-- [CompileMan] [nvarchar](50) NULL, +-- CONSTRAINT [PK_PostTraining_Role] 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] +--ALTER TABLE [dbo].[PostTraining_Role] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Role_Sys_User] FOREIGN KEY([CompileMan]) +--REFERENCES [dbo].[Sys_User] ([UserId]) +--ALTER TABLE [dbo].[PostTraining_Role] CHECK CONSTRAINT [FK_PostTraining_Role_Sys_User] +--EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Role', @level2type=N'COLUMN',@level2name=N'Id' +--EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Role', @level2type=N'COLUMN',@level2name=N'Code' +--EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Role', @level2type=N'COLUMN',@level2name=N'Name' +--EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Role', @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'PostTraining_Role', @level2type=N'COLUMN',@level2name=N'CompileMan' +--EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Role', @level2type=N'COLUMN',@level2name=N'CompileDate' +--EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵɫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Role' +--END + +GO + + +--λѵγ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Course') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Course]( + [Id] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [CategoryId] [nvarchar](50) NULL, + [CategoryName] [nvarchar](200) NULL, + [Method1] [nvarchar](200) NULL, + [Method2] [nvarchar](200) NULL, + [Teachers1] [nvarchar](200) NULL, + [Teachers2] [nvarchar](200) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_PostTraining_Course] 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] +ALTER TABLE [dbo].[PostTraining_Course] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Course_PostTraining_Category] FOREIGN KEY([CategoryId]) +REFERENCES [dbo].[PostTraining_Category] ([Id]) +ALTER TABLE [dbo].[PostTraining_Course] CHECK CONSTRAINT [FK_PostTraining_Course_PostTraining_Category] +ALTER TABLE [dbo].[PostTraining_Course] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Course_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[PostTraining_Course] CHECK CONSTRAINT [FK_PostTraining_Course_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'γ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'CategoryId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'CategoryName' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʽһ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'Method1' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'Method2' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʦһ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'Teachers1' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʦʶ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'Teachers2' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @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'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵγ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Course' +END + +GO + +--λѵ׼ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Standard') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Standard]( + [Id] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [WorkPostId] [nvarchar](50) NOT NULL, + [CourseId] [nvarchar](50) NOT NULL, + [ClassHour] [decimal](10, 2) NOT NULL, + [Cycle] [decimal](10, 2) NOT NULL, + [Method] [nvarchar](200) NULL, + [Outcome] [nvarchar](200) NULL, + [Teachers] [nvarchar](200) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_PostTraining_Standard] 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] +ALTER TABLE [dbo].[PostTraining_Standard] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Standard_Base_WorkPost] FOREIGN KEY([WorkPostId]) +REFERENCES [dbo].[FK_PostTraining_Standard_Base_WorkPost] ([WorkPostId]) +ALTER TABLE [dbo].[PostTraining_Standard] CHECK CONSTRAINT [FK_PostTraining_Standard_Base_WorkPost] + +ALTER TABLE [dbo].[PostTraining_Standard] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Standard_PostTraining_Course] FOREIGN KEY([CourseId]) +REFERENCES [dbo].[PostTraining_Course] ([Id]) +ALTER TABLE [dbo].[PostTraining_Standard] CHECK CONSTRAINT [FK_PostTraining_Standard_PostTraining_Course] + +ALTER TABLE [dbo].[PostTraining_Standard] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Standard_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[PostTraining_Standard] CHECK CONSTRAINT [FK_PostTraining_Standard_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɫid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'RoleId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'γid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'CourseId' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʱѧʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'ClassHour' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵڣ/Σ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'Cycle' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'Method' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵЧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'Outcome' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʦ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'Teachers' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @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'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵ׼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Standard' +END + +GO + + +--λѵʽ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Method') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Method]( + [Id] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_PostTraining_Method] 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] +ALTER TABLE [dbo].[PostTraining_Method] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Method_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[PostTraining_Method] CHECK CONSTRAINT [FK_PostTraining_Method_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Method', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Method', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Method', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Method', @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'PostTraining_Method', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Method', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Method' +END + +GO +--λѵʽ +IF NOT EXISTS (SELECT * FROM PostTraining_Method) +BEGIN + INSERT INTO PostTraining_Method(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('C4068604-B6CE-4CA3-BF32-09AF438680E6','001','ڿ','ڿ',getdate(),null); + INSERT INTO PostTraining_Method(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('56E2F7C6-3C9E-43A2-ACB2-528CAF0C9FD9','002','ʵ','ʵ',getdate(),null); + INSERT INTO PostTraining_Method(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('A33B9EE5-39EF-4600-81C3-9EB652F95CE0','003','','',getdate(),null); + INSERT INTO PostTraining_Method(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('A0AA2D97-838A-4550-970F-46096985A857','004','˻ϵͳ','˻ϵͳ',getdate(),null); + INSERT INTO PostTraining_Method(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('B8609955-7D92-4E5D-AEFB-AC49E7538A65','005','','',getdate(),null); +END + +GO +--λѵʦ +IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'PostTraining_Teachers') AND type = N'U') +BEGIN + +CREATE TABLE [dbo].[PostTraining_Teachers]( + [Id] [nvarchar](50) NOT NULL, + [Code] [nvarchar](50) NULL, + [Name] [nvarchar](200) NULL, + [Remark] [nvarchar](1000) NULL, + [CompileDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + CONSTRAINT [PK_PostTraining_Teachers] 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] +ALTER TABLE [dbo].[PostTraining_Teachers] WITH CHECK ADD CONSTRAINT [FK_PostTraining_Teachers_Sys_User] FOREIGN KEY([CompileMan]) +REFERENCES [dbo].[Sys_User] ([UserId]) +ALTER TABLE [dbo].[PostTraining_Teachers] CHECK CONSTRAINT [FK_PostTraining_Teachers_Sys_User] +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Teachers', @level2type=N'COLUMN',@level2name=N'Id' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Teachers', @level2type=N'COLUMN',@level2name=N'Code' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Teachers', @level2type=N'COLUMN',@level2name=N'Name' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Teachers', @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'PostTraining_Teachers', @level2type=N'COLUMN',@level2name=N'CompileMan' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Teachers', @level2type=N'COLUMN',@level2name=N'CompileDate' +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λѵʦ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PostTraining_Teachers' +END + +GO +--λѵʦʻ +IF NOT EXISTS (SELECT * FROM PostTraining_Teachers) +BEGIN + INSERT INTO PostTraining_Teachers(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('2FC909EB-CB7A-4470-BC04-B37FD9818A27','001','ֱ쵼','ֱ쵼',getdate(),null); + INSERT INTO PostTraining_Teachers(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('30646530-7AD1-4098-89E0-D74D36AC2A73','002','ڲѵʦ','ڲѵʦ',getdate(),null); + INSERT INTO PostTraining_Teachers(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('5D0A278A-7D0A-4B36-B581-AF4FEE84BCE6','003','Ƹʦ','Ƹʦ',getdate(),null); + INSERT INTO PostTraining_Teachers(Id,Code,Name,Remark,CompileDate,CompileMan) + VALUES('4CCC415D-BC3A-4A36-ACE2-757A43C25B16','004','','',getdate(),null); +END + +GO + +/****** Object: View [dbo].[View_PostTraining_RecordDetail] Script Date: 2025-2-20 17:56:03 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +--λѵ¼ϸбͼ +CREATE VIEW [dbo].[View_PostTraining_RecordDetail] AS +SELECT recordDetail.Id AS DetailId, + recordDetail.RecordId, + recordDetail.PersonId, + person.UnitId, + unit.UnitName, + person.PersonName, + workPost.WorkPostName AS WorkPostName +FROM dbo.PostTraining_Record_Detail AS recordDetail +LEFT JOIN dbo.SitePerson_Person AS person ON person.PersonId = recordDetail.PersonId +LEFT JOIN dbo.Base_Unit AS unit ON unit.UnitId=person.UnitId +LEFT JOIN dbo.Base_WorkPost AS workPost ON workPost.WorkPostId=person.WorkPostId + +GO + +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, + Post.WorkPostName, + 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,''), + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + 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, + Person.BlackList, + Person.BlackReason, + Person.States, + sysUser.StarLevelId, + StarLevel.StarMark, + StarLevel.LevelValue + --,Person.PostTrainingRoleId, + --PostRole.Name AS PostTrainingRoleName + +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 +Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId +Left JOIN Base_StarLevel AS StarLevel ON sysUser.StarLevelId = StarLevel.StarLevelId +--Left JOIN PostTraining_Role AS PostRole ON PostRole.Id = Person.PostTrainingRoleId + +GO + +ALTER VIEW [dbo].[View_SitePerson_PersonList] +AS + +SELECT + Person.PersonId, + Person.ProjectId, + Person.IsUsed, + Person.IsForeign, + Person.IsOutside, + Person.BlackList, + Person.CardNo, + Person.PersonName, + Person.UnitId, + Unit.UnitName, + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +Person.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + TeamGroup.TeamGroupName, + Person.InTime, + Person.OutTime, + (CASE Person.IsUsed WHEN 'TRUE' THEN '' ELSE '' END) AS IsUsedName, + Person.IdentityCard, + Person.TeamGroupId, + Person.WorkPostId, + Post.WorkPostName, + Person.IdcardType, + Person.PhotoUrl, + edu.TrainCount, + PoliticsStatus.dictName AS PoliticsStatusName + --,Person.PostTrainingRoleId, + --PostRole.Name AS PostTrainingRoleName +FROM SitePerson_Person AS Person +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Person.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=Person.TeamGroupId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = Person.WorkPostId +LEFT JOIN RealName_BasicData AS PoliticsStatus ON PoliticsStatus.dictCode = Person.PoliticsStatus AND PoliticsStatus.DictTypeCode='POLITICAL_LANDSCAPE' +LEFT JOIN (select PersonId,count(PersonId)as TrainCount from EduTrain_TrainRecordDetail group by PersonId) as edu on edu.PersonId= Person.PersonId +--LEFT JOIN PostTraining_Role AS PostRole ON PostRole.Id = Person.PostTrainingRoleId + + + +GO + diff --git a/DataBase/版本日志/SGGLDB_V2025-02-25-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-02-25-xiaj.sql new file mode 100644 index 0000000..af494cc --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-02-25-xiaj.sql @@ -0,0 +1,126 @@ + + +--1˾ѵ̲IJøλ̶ +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Training_CompanyTrainingItem' AND COLUMN_NAME = 'WorkPostNames') +BEGIN + ALTER TABLE Training_CompanyTrainingItem ADD WorkPostNames nvarchar(max); + ALTER TABLE Training_CompanyTrainingItem ALTER COLUMN WorkPostIds nvarchar(max); + ALTER TABLE Training_CompanyTrainingItem ADD Outcome INT DEFAULT(0) ; +END +GO +ALTER TABLE Training_CompanyTrainingItem +DROP COLUMN Effect; + +--2HSEճѲ첹޽̲Id +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'HSSE_Hazard_HazardRegister' AND COLUMN_NAME = 'CompanyTrainingItemId') +BEGIN + ALTER TABLE HSSE_Hazard_HazardRegister ADD CompanyTrainingItemId nvarchar(50); +END +GO +--3HSE쵼鲹ˡ޽̲Id +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Check_ProjectLeaderCheck' AND COLUMN_NAME = 'CompanyTrainingItemId') +BEGIN + ALTER TABLE Check_ProjectLeaderCheck ADD ResponsibleMan nvarchar(50); + ALTER TABLE Check_ProjectLeaderCheck ADD CompanyTrainingItemId nvarchar(50); +END +GO + +--5ѵƻǷѵ𡢼¼Id +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Training_Plan' AND COLUMN_NAME = 'IsRetakeCourse') +BEGIN + --Ƿѵ + ALTER TABLE Training_Plan ADD IsRetakeCourse INT DEFAULT(0) ; + -- + ALTER TABLE Training_Plan ADD CheckType nvarchar(50) ; + --¼Id + ALTER TABLE Training_Plan ADD CheckId nvarchar(50) ; + --ѵ̲Id + ALTER TABLE Training_Plan ADD CompanyTrainingItemId nvarchar(50) ; +END +GO + + +/****** Object: View [dbo].[View_Hazard_HazardRegister] Script Date: 2025-2-25 18:12:14 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +ALTER VIEW [dbo].[View_Hazard_HazardRegister] AS SELECT Registration.HazardRegisterId, + Registration.HazardCode, + Registration.RegisterDate, + Registration.RegisterDef, + Registration.Rectification, + Registration.Place, + Registration.ResponsibleUnit, + Registration.Observer, + Registration.Risk_Level, + Registration.RectifiedDate, + Registration.ProjectId, + Project.UnitId AS PUnitId, + ProjectUnit.UnitName AS PUnitName, + Registration.states, + Registration.IsEffective, + Registration.ResponsibleMan, + Registration.CheckManId, + Registration.CheckTime, + Registration.RectificationPeriod, + Registration.ImageUrl, + Registration.RectificationImageUrl, + Registration.RectificationTime, + Registration.ConfirmMan, + Registration.ConfirmDate, + Registration.HandleIdea, + Registration.CutPayment, + Registration.ProblemTypes, + Registration.CheckSpecialId, + Registration.CheckItemDetailId, + Registration.SupCheckItemSetId, + Registration.CheckItemSetId, + Registration.SafeSupervisionId, + Registration.SafeSupervisionIsOK, + Project.ProjectName, + Registration.CheckCycle, + ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName, + Unit.UnitName as ResponsibilityUnitName, + User1.UserName AS ResponsibilityManName, + User1.UserId AS ResponsibilityManId, + ISNULL(User1.Telephone,'') AS ResponsibilityManTel, + User2.UserName AS CheckManName, + ISNULL(User2.Telephone,'') AS CheckManTel, + User2.UnitId AS SendUnitId, + User3.UserName AS ConfirmManName, + ISNULL(User3.Telephone,'') AS ConfirmManTel, + User4.UserName AS ResponsibilityManName2, + ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel, + (CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '' + WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ϸ' + WHEN Registration.states='2' THEN '-' + WHEN Registration.states='3' THEN 'ѱջ' + ELSE '' END ) AS StatesStr, + RegisterTypes.RegisterTypesId, + RegisterTypes.RegisterTypesName, + Registration.DIC_ID, + Registration.CCManIds, + CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User + where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0 + ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',') + FOR XML PATH('')), 1, 1,''), + Registration.Requirements, + Registration.CompanyTrainingItemId +FROM dbo.HSSE_Hazard_HazardRegister AS Registration +LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId +LEFT JOIN dbo.Base_Unit AS ProjectUnit ON Project.UnitId = ProjectUnit.UnitId +LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place +LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId +LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit +LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan +LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId +LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan +LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2 + + +GO + + diff --git a/DataBase/版本日志/SGGLDB_V2025-08-07-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-08-07-xiaj.sql index e8822aa..9a59bdc 100644 --- a/DataBase/版本日志/SGGLDB_V2025-08-07-xiaj.sql +++ b/DataBase/版本日志/SGGLDB_V2025-08-07-xiaj.sql @@ -3,8 +3,13 @@ IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'SitePerson_Person' AND COLUMN_NAME = 'EmployeeCategoryId') BEGIN ALTER TABLE SitePerson_Person ADD EmployeeCategoryId varchar(50); + ALTER TABLE SitePerson_Person ADD EmployeeCategoryName varchar(50); ALTER TABLE SitePerson_Person ADD EmployeeSubgroupId varchar(50); + ALTER TABLE SitePerson_Person ADD EmployeeSubgroupName varchar(50); ALTER TABLE SitePerson_Person ADD InstitutionalDivisionId varchar(50); + ALTER TABLE SitePerson_Person ADD InstitutionalDivisionName varchar(50); + ALTER TABLE SitePerson_Person ADD DepartName varchar(50); + ALTER TABLE SitePerson_Person ADD Remarks nvarchar(500); END GO diff --git a/DataBase/版本日志/SGGLDB_V2025-08-09-xiaj.sql b/DataBase/版本日志/SGGLDB_V2025-08-09-xiaj.sql new file mode 100644 index 0000000..6921a06 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-08-09-xiaj.sql @@ -0,0 +1,124 @@ + + +/****** Object: View [dbo].[View_SitePerson_Person] Script Date: 2025-8-8 16:46:17 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + +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.InstitutionalDivisionId, + Person.EmployeeCategoryId, + Person.EmployeeSubgroupId, + Person.DepartId, + Person.PhotoUrl, + Person.IsUsed, + Person.Remarks, + (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, + EmployeeCategory.CategoryName as EmployeeCategoryName, + EmployeeSubgroup.SubgroupName as EmployeeSubgroupName, + Division.Name as InstitutionalDivisionName, + 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, + Person.BlackList, + Person.BlackReason, + Person.States, + sysUser.StarLevelId, + StarLevel.StarMark, + StarLevel.LevelValue + +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 Base_EmployeeCategory AS EmployeeCategory ON EmployeeCategory.CategoryId = Person.EmployeeCategoryId +Left JOIN Base_EmployeeSubgroup AS EmployeeSubgroup ON EmployeeSubgroup.SubgroupId = Person.EmployeeSubgroupId +Left JOIN Base_InstitutionalDivision AS Division ON Division.Id = Person.InstitutionalDivisionId +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 +Left JOIN Base_CNProfessional AS CNProfessional ON CNProfessional.CNProfessionalId = Person.MainCNProfessionalId +Left JOIN Base_StarLevel AS StarLevel ON sysUser.StarLevelId = StarLevel.StarLevelId + +GO + + diff --git a/SGGL/BLL/API/APIBaseInfoService.cs b/SGGL/BLL/API/APIBaseInfoService.cs index d2cb1fc..0bdef87 100644 --- a/SGGL/BLL/API/APIBaseInfoService.cs +++ b/SGGL/BLL/API/APIBaseInfoService.cs @@ -866,11 +866,11 @@ namespace BLL var tb1 = SQLHelper.GetDataTableRunText(strSql1, null); string strSql2 = @" select ProjectId,COUNT(1) num from [dbo].[SitePerson_Person] - where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + "') and UnitId ='"+Const.UnitId_TCC+@"' + where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + "') and UnitId ='"+Const.UnitId_XJYJ+@"' group by ProjectId"; var tb2 = SQLHelper.GetDataTableRunText(strSql2, null); string strSql3 = @"select ProjectId,COUNT(1) num from [dbo].[SitePerson_Person] - where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + @"') and UnitId !='"+Const.UnitId_TCC+@"' + where IsUsed=1 and (OutTime is null or OutTime>'" + dateZ + @"') and UnitId !='"+Const.UnitId_XJYJ+@"' group by ProjectId"; var tb3 = SQLHelper.GetDataTableRunText(strSql3, null); diff --git a/SGGL/BLL/API/APICommonService.cs b/SGGL/BLL/API/APICommonService.cs index e7fac5d..a27543e 100644 --- a/SGGL/BLL/API/APICommonService.cs +++ b/SGGL/BLL/API/APICommonService.cs @@ -24,8 +24,8 @@ namespace BLL public static string getaccess_token() { string access_token = string.Empty; - string appid = Const.AppID_TCC; - string secret = Const.AppSecret_TCC; + string appid = Const.AppID_XJYJ; + string secret = Const.AppSecret_XJYJ; //string appid = "wxb5f0e8051b7b9eee"; //string secret = "626175f8860bf84beb4cf507b9445115"; using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) @@ -130,8 +130,8 @@ namespace BLL public static string getUserOpenId(string userId, string jsCode,bool isRefresh = false) { string openId = string.Empty; - string appid = Const.AppID_TCC; - string secret = Const.AppSecret_TCC; + string appid = Const.AppID_XJYJ; + string secret = Const.AppSecret_XJYJ; //string appid = "wxb5f0e8051b7b9eee"; //string secret = "626175f8860bf84beb4cf507b9445115"; using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index cb5802f..e66cb46 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -347,7 +347,7 @@ namespace BLL where x.ProjectId == projectId && (strUnitId == null || x.UnitId == strUnitId) && (strWorkPostId == null || x.WorkPostId == strWorkPostId) select x; - if (unitId != Const.UnitId_TCC && !string.IsNullOrEmpty(unitId)) + if (unitId != Const.UnitId_XJYJ && !string.IsNullOrEmpty(unitId)) { getViews = getViews.Where(x => x.UnitId == unitId); } @@ -1152,7 +1152,7 @@ namespace BLL ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime), ChangeTimeD = x.ChangeTime, }; - if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_TCC) + if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_XJYJ) { personInOuts = personInOuts.Where(x => x.UnitId == unitId); } @@ -1204,7 +1204,7 @@ namespace BLL ChangeTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ChangeTime), ChangeTimeD = x.ChangeTime, }; - if (!string.IsNullOrEmpty(userUnitId) && userUnitId != Const.UnitId_TCC) + if (!string.IsNullOrEmpty(userUnitId) && userUnitId != Const.UnitId_XJYJ) { personInOuts = personInOuts.Where(x => x.UnitId == userUnitId); } diff --git a/SGGL/BLL/API/HSSE/APIGoodsManageService.cs b/SGGL/BLL/API/HSSE/APIGoodsManageService.cs index 7917911..afc9ecc 100644 --- a/SGGL/BLL/API/HSSE/APIGoodsManageService.cs +++ b/SGGL/BLL/API/HSSE/APIGoodsManageService.cs @@ -261,7 +261,7 @@ namespace BLL }; if (setItem.UnitType == "1") { - newFlowOperate.UnitIds = Const.UnitId_TCC; + newFlowOperate.UnitIds = Const.UnitId_XJYJ; } else { diff --git a/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs b/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs index 00e471a..8be834c 100644 --- a/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs +++ b/SGGL/BLL/API/HSSE/APIReceiveFileManagerService.cs @@ -91,7 +91,7 @@ namespace BLL }).AsEnumerable(); if (getReceiveFileManagerItem.Count() > 0) { - if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_TCC) + if (!string.IsNullOrEmpty(unitId) && unitId != Const.UnitId_XJYJ) { getReceiveFileManagerItem = getReceiveFileManagerItem.Where(x => x.FileUnitId == unitId || (x.UnitIds != null && x.UnitIds.Contains(unitId))); } diff --git a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs index e829a76..155ee53 100644 --- a/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs +++ b/SGGL/BLL/API/HSSE/APISeDinMonthReportService.cs @@ -372,7 +372,7 @@ namespace BLL var startDateD = Funs.GetNewDateTime(startDate); var endDateD = Funs.GetNewDateTime(endDate); var getPersons = from x in db.SitePerson_Person - where x.ProjectId == projectId && x.InTime <= startDateD && (!x.OutTime.HasValue) && x.UnitId ==Const.UnitId_TCC + where x.ProjectId == projectId && x.InTime <= startDateD && (!x.OutTime.HasValue) && x.UnitId ==Const.UnitId_XJYJ select x; Model.SeDinMonthReport4OtherItem newItem = new Model.SeDinMonthReport4OtherItem { diff --git a/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs b/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs index e15c35f..ca2f851 100644 --- a/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs +++ b/SGGL/BLL/API/HSSE/APIServerTestRecordService.cs @@ -78,13 +78,13 @@ namespace BLL } else { - newTestRecord.UnitId = newTestRecord.UnitId = Const.UnitId_TCC; + newTestRecord.UnitId = newTestRecord.UnitId = Const.UnitId_XJYJ; } } newTestRecord.DepartName = DepartService.getDepartNameById(newTestRecord.DepartId); newTestRecord.UnitName = UnitService.GetUnitNameByUnitId(newTestRecord.UnitId); newTestRecord.ProjectName = ProjectService.GetProjectNameByProjectId(newTestRecord.ProjectId); - if (newTestRecord.UnitId == Const.UnitId_TCC) + if (newTestRecord.UnitId == Const.UnitId_XJYJ) { newTestRecord.IsThiUnit = true; } diff --git a/SGGL/BLL/Common/CommonService.cs b/SGGL/BLL/Common/CommonService.cs index e86432e..29de1fc 100644 --- a/SGGL/BLL/Common/CommonService.cs +++ b/SGGL/BLL/Common/CommonService.cs @@ -341,7 +341,7 @@ namespace BLL else { var user = UserService.GetUserByUserId(userId); - if (user != null && user.UnitId == Const.UnitId_TCC) + if (user != null && user.UnitId == Const.UnitId_XJYJ) { result = true; } @@ -668,14 +668,14 @@ namespace BLL /// public static string GetThisUnitId() { - string unitId = Const.UnitId_TCC; + string unitId = Const.UnitId_XJYJ; return unitId; } public static Model.Base_Unit GetIsThisUnit() { - return (Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitId == Const.UnitId_TCC)); //本单位 + return (Funs.DB.Base_Unit.FirstOrDefault(e => e.UnitId == Const.UnitId_XJYJ)); //本单位 } } diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index a93390f..5ffde12 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -923,15 +923,15 @@ namespace BLL /// /// 新疆油建单位id /// - public const string UnitId_TCC = "b4f3d912-ca6d-440c-a8d7-bc6a5d5a1f84"; + public const string UnitId_XJYJ = "b4f3d912-ca6d-440c-a8d7-bc6a5d5a1f84"; /// - /// 天辰 + /// 新疆油建 /// - public const string AppID_TCC = "wxa4b25a008458d7ba"; + public const string AppID_XJYJ = "wxa4b25a008458d7ba"; /// - /// 天辰 + /// 新疆油建 /// - public const string AppSecret_TCC = "610d0310fe6ce1b7b33440438c54d3eb"; + public const string AppSecret_XJYJ = "610d0310fe6ce1b7b33440438c54d3eb"; /// ///施工部门id diff --git a/SGGL/BLL/HSSE/Manager/HSSELogService.cs b/SGGL/BLL/HSSE/Manager/HSSELogService.cs index 9d10edf..9362c89 100644 --- a/SGGL/BLL/HSSE/Manager/HSSELogService.cs +++ b/SGGL/BLL/HSSE/Manager/HSSELogService.cs @@ -163,7 +163,7 @@ namespace BLL if (compileDate.HasValue) ///操作日期 { var puser = BLL.ProjectUserService.GetProjectUserByUserIdProjectId(projectId, compileMan); ///操作人是安全工程师或者安全经理 - var thisUnit = BLL.Const.UnitId_TCC; + var thisUnit = BLL.Const.UnitId_XJYJ; if (puser != null && thisUnit != null && thisUnit == puser.UnitId && (puser.RoleId == BLL.Const.HSSEManager || puser.RoleId == BLL.Const.HSSEEngineer)) { if (operateName == Const.BtnAdd) ////添加日志 diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs index 7f2b912..f65c130 100644 --- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs +++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs @@ -374,6 +374,7 @@ namespace BLL //PostTrainingRoleId = person.PostTrainingRoleId, OutTime = person.OutTime, OutResult = person.OutResult, + Remarks = person.Remarks, Telephone = person.Telephone, PositionId = person.PositionId, PostTitleId = person.PostTitleId, @@ -381,7 +382,6 @@ namespace BLL HeadImage = person.HeadImage, IsUsed = person.IsUsed, IsCardUsed = person.IsCardUsed, - DepartId = person.DepartId, FromPersonId = person.FromPersonId, Password = GetPersonPassWord(person.IdentityCard), AuditorId = person.AuditorId, @@ -391,6 +391,14 @@ namespace BLL EduLevel = person.EduLevel, MaritalStatus = person.MaritalStatus, Isprint = "0", + InstitutionalDivisionId = person.InstitutionalDivisionId, + DepartId = person.DepartId, + EmployeeCategoryId = person.EmployeeCategoryId, + EmployeeSubgroupId = person.EmployeeSubgroupId, + InstitutionalDivisionName = person.InstitutionalDivisionName, + DepartName = person.DepartName, + EmployeeCategoryName = person.EmployeeCategoryName, + EmployeeSubgroupName = person.EmployeeSubgroupName, MainCNProfessionalId = person.MainCNProfessionalId, ViceCNProfessionalId = person.ViceCNProfessionalId, Birthday = person.Birthday, @@ -456,6 +464,7 @@ namespace BLL newPerson.OutTime = person.OutTime; newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring; newPerson.OutResult = person.OutResult; + newPerson.Remarks = person.Remarks; newPerson.Telephone = person.Telephone; newPerson.PositionId = person.PositionId; newPerson.PostTitleId = person.PostTitleId; @@ -465,7 +474,6 @@ namespace BLL newPerson.IsCardUsed = person.IsCardUsed; newPerson.EduLevel = person.EduLevel; newPerson.MaritalStatus = person.MaritalStatus; - newPerson.DepartId = person.DepartId; newPerson.QRCodeAttachUrl = person.QRCodeAttachUrl; newPerson.Password = GetPersonPassWord(person.IdentityCard); newPerson.ExchangeTime = null; @@ -483,6 +491,14 @@ namespace BLL newPerson.IsForeign = person.IsForeign; newPerson.IsOutside = person.IsOutside; newPerson.Birthday = person.Birthday; + newPerson.InstitutionalDivisionId = person.InstitutionalDivisionId; + newPerson.DepartId = person.DepartId; + newPerson.EmployeeCategoryId = person.EmployeeCategoryId; + newPerson.EmployeeSubgroupId = person.EmployeeSubgroupId; + newPerson.InstitutionalDivisionName = person.InstitutionalDivisionName; + newPerson.DepartName = person.DepartName; + newPerson.EmployeeCategoryName = person.EmployeeCategoryName; + newPerson.EmployeeSubgroupName = person.EmployeeSubgroupName; newPerson.MainCNProfessionalId = person.MainCNProfessionalId; newPerson.ViceCNProfessionalId = person.ViceCNProfessionalId; newPerson.IdcardType = person.IdcardType; diff --git a/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs b/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs index c9c5f04..51367a6 100644 --- a/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs +++ b/SGGL/BLL/PZHGL/InformationProject/ReceiveFileManagerService.cs @@ -109,7 +109,7 @@ namespace BLL public static void CreateReceiveFile(Model.InformationProject_Notice notice) { var getProjects = Funs.GetStrListByStr(notice.AccessProjectId, ','); - string unitId =Const.UnitId_TCC; + string unitId =Const.UnitId_XJYJ; var getAtt = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == notice.NoticeId); foreach (var item in getProjects) { diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 9c45903..7f084c3 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -651,7 +651,7 @@ where (x.ProjectState == null || x.ProjectState == BLL.Const.ProjectState_1) select x; - if (unitId == BLL.Const.UnitId_TCC) + if (unitId == BLL.Const.UnitId_XJYJ) { getDatas = getDatas.Where(x => x.UnitId == unitId || x.UnitId == null); } diff --git a/SGGL/BLL/ProjectData/ProjectUnitService.cs b/SGGL/BLL/ProjectData/ProjectUnitService.cs index 37ac0f0..366519e 100644 --- a/SGGL/BLL/ProjectData/ProjectUnitService.cs +++ b/SGGL/BLL/ProjectData/ProjectUnitService.cs @@ -128,7 +128,7 @@ public static bool GetProjectUnitTypeByProjectIdUnitId(string projectId, string unitId) { bool isShow = false; - if (unitId != Const.UnitId_TCC) + if (unitId != Const.UnitId_XJYJ) { var pUnit = Funs.DB.Project_ProjectUnit.FirstOrDefault(e => e.ProjectId == projectId && e.UnitId == unitId); if (pUnit != null) diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs index 55ac4e0..a9e79aa 100644 --- a/SGGL/BLL/SysManage/UnitService.cs +++ b/SGGL/BLL/SysManage/UnitService.cs @@ -163,7 +163,7 @@ namespace BLL /// public static List GetThisUnitDropDownList() { - var list = (from x in Funs.DB.Base_Unit where x.UnitId == Const.UnitId_TCC select x).ToList(); + var list = (from x in Funs.DB.Base_Unit where x.UnitId == Const.UnitId_XJYJ select x).ToList(); return list; } @@ -176,7 +176,7 @@ namespace BLL List unitList = new List(); if (string.IsNullOrEmpty(unitId)) { - unitId = Const.UnitId_TCC; + unitId = Const.UnitId_XJYJ; } var unitIdList = GetChildrenUnitId(unitId); if (unitIdList.Count() > 0) @@ -216,7 +216,7 @@ namespace BLL if (isThisUnit) { list = (from x in Funs.DB.Base_Unit - where x.IsBranch == true || x.UnitId == Const.UnitId_TCC + where x.IsBranch == true || x.UnitId == Const.UnitId_XJYJ select x).OrderBy(x => x.UnitCode).ToList(); } return list; @@ -923,7 +923,7 @@ namespace BLL { using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { - var q = (from x in db.Base_Unit where x.UnitId != BLL.Const.UnitId_TCC orderby x.UnitCode select x).ToList(); + var q = (from x in db.Base_Unit where x.UnitId != BLL.Const.UnitId_XJYJ orderby x.UnitCode select x).ToList(); return q; } } diff --git a/SGGL/BLL/SysManage/UserService.cs b/SGGL/BLL/SysManage/UserService.cs index 7e87c27..fdf2488 100644 --- a/SGGL/BLL/SysManage/UserService.cs +++ b/SGGL/BLL/SysManage/UserService.cs @@ -1584,7 +1584,7 @@ namespace BLL using (Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString)) { var user = (from x in db.Sys_User - where x.IsPost == true && x.UnitId == Const.UnitId_TCC && x.DepartId == Const.Depart_constructionId + where x.IsPost == true && x.UnitId == Const.UnitId_XJYJ && x.DepartId == Const.Depart_constructionId orderby x.UserId select x).ToList(); ListItem[] lis = new ListItem[user.Count()]; diff --git a/SGGL/BLL/WebService/CNCECHSSEWebService.cs b/SGGL/BLL/WebService/CNCECHSSEWebService.cs index 0d9838f..9764729 100644 --- a/SGGL/BLL/WebService/CNCECHSSEWebService.cs +++ b/SGGL/BLL/WebService/CNCECHSSEWebService.cs @@ -1935,7 +1935,7 @@ try { CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient(); - var getData = hsseC.GetInformation_UrgeReportToSUB(Const.UnitId_TCC); + var getData = hsseC.GetInformation_UrgeReportToSUB(Const.UnitId_XJYJ); if (getData.Count() > 0) { foreach (var item in getData) @@ -1992,7 +1992,7 @@ try { CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient(); - var getData = hsseC.GetCheck_CheckRectifyListToSUB(Const.UnitId_TCC); + var getData = hsseC.GetCheck_CheckRectifyListToSUB(Const.UnitId_XJYJ); if (getData.Count() > 0) { List ids = new List(); @@ -2095,7 +2095,7 @@ try { CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient(); - var getData = hsseC.GetCheck_CheckInfo_Table8ItemListToSUB(Const.UnitId_TCC); + var getData = hsseC.GetCheck_CheckInfo_Table8ItemListToSUB(Const.UnitId_XJYJ); if (getData.Count() > 0) { List ids = new List(); @@ -2261,7 +2261,7 @@ } } - var getDataItem = hsseC.GetSupervise_SubUnitReportItemListToSUB(Const.UnitId_TCC); + var getDataItem = hsseC.GetSupervise_SubUnitReportItemListToSUB(Const.UnitId_XJYJ); foreach (var item in getDataItem) { var newItem = db.Supervise_SubUnitReportItem.FirstOrDefault(e => e.SubUnitReportItemId == item.SubUnitReportItemId); diff --git a/SGGL/BLL/ZHGL/Information/AnalyseResourceService.cs b/SGGL/BLL/ZHGL/Information/AnalyseResourceService.cs index 7adc55c..77a5fb3 100644 --- a/SGGL/BLL/ZHGL/Information/AnalyseResourceService.cs +++ b/SGGL/BLL/ZHGL/Information/AnalyseResourceService.cs @@ -20,7 +20,7 @@ namespace BLL units = units.Where(x => unitIdList.Contains(x.UnitId)).ToList(); } ///本单位 - string thisUnitId = BLL.Const.UnitId_TCC; + string thisUnitId = BLL.Const.UnitId_XJYJ; //var unitThis = BLL.CommonService.GetIsThisUnit(); //if (unitThis != null) //{ diff --git a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs index 0f27e1d..f3681ca 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/BaseFactoryEdit.aspx.cs @@ -64,7 +64,7 @@ namespace FineUIPro.Web.BaseInfo return; } Model.Base_Factory table = new Model.Base_Factory(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.FactoryCode = this.txtFactoryCode.Text; table.FactoryName = this.txtFactoryName.Text; table.Address = this.txtAddress.Text; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactList.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactList.aspx.cs index 4340b03..d2583db 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactList.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactList.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); btnNew.OnClientClick = Window1.GetShowReference("ContactListEdit.aspx") + "return false;"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { this.drpProposeUnit.Hidden = true; } @@ -84,7 +84,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND a.UnitId='" + this.CurrUser.UnitId+"'"; } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactListEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactListEdit.aspx.cs index d752aa3..f09ac8a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/ContactListEdit.aspx.cs @@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); ContactListId = Request.Params["ContactListId"]; this.State = "1"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { drpUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs index 4b4ddc6..a712bb2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataDistributionEdit.aspx.cs @@ -38,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs index ffbf101..35043b5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DataReceivingEdit.aspx.cs @@ -153,7 +153,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs index 4c94776..45bc05a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignChangeOrderEdit.aspx.cs @@ -162,7 +162,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs index fcc12c8..168eb32 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs @@ -150,7 +150,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs index 47e89f1..589aabd 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDrawingsEdit.aspx.cs @@ -145,7 +145,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs index 92f33a1..bfeb8d5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFile.aspx.cs @@ -22,7 +22,7 @@ namespace FineUIPro.Web.Comprehensive GetButtonPower(); BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true); var punit= ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId); - if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_TCC|| punit.UnitType==Const.ProjectUnitType_3) + if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_XJYJ|| punit.UnitType==Const.ProjectUnitType_3) { BLL.UnitService.InitUnitDownList(this.sdrpUnitId, this.CurrUser.LoginProjectId, true); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFileEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFileEdit.aspx.cs index ef444dc..f8e82e2 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFileEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/FinalFileEdit.aspx.cs @@ -38,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive this.FinalFileId = Request.Params["FinalFileId"]; BLL.UnitService.InitUnitDownList(this.dpUnit, this.CurrUser.LoginProjectId, true); var punit = ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId); - if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_TCC || punit.UnitType == Const.ProjectUnitType_3) + if (CurrUser.UserId == Const.sysglyId || CurrUser.UnitId == Const.UnitId_XJYJ || punit.UnitType == Const.ProjectUnitType_3) { BLL.UnitService.InitUnitDownList(this.dpUnit, this.CurrUser.LoginProjectId, true); } diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs index c62f070..f3e12b5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionEquipmentEdit.aspx.cs @@ -215,7 +215,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs index e1f1239..2ba7b58 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive GetButtonPower(); BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true); - if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_TCC) + if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_XJYJ) { this.drpUnitId.Enabled = true; } @@ -169,7 +169,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs index e410279..29e2306 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs @@ -191,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs index 3770442..a85f5dc 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/NCRManagementEdit.aspx.cs @@ -163,7 +163,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs index 56bce54..003a9e5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/PressurePipeEdit.aspx.cs @@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs index a78c1b7..5366164 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/QualityAccidentEdit.aspx.cs @@ -131,7 +131,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs index bb87b3d..34d3e92 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SiteVisaManagementEdit.aspx.cs @@ -149,7 +149,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs index 725a42a..eedc729 100644 --- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/SpecialEquipmentEdit.aspx.cs @@ -138,7 +138,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Information/EditVisaApplicationFinal.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/EditVisaApplicationFinal.aspx.cs index 6b6d615..8c406f1 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/EditVisaApplicationFinal.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/EditVisaApplicationFinal.aspx.cs @@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Solution txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); visaApplicationFinalId = Request.Params["visaApplicationFinalId"]; this.State = "1"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { drpUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/CQMS/Information/EditWorkOrderFinal.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/EditWorkOrderFinal.aspx.cs index 7bf3246..bed1974 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/EditWorkOrderFinal.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/EditWorkOrderFinal.aspx.cs @@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Solution txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); WorkOrderFinalId = Request.Params["WorkOrderFinalId"]; this.State = "1"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { drpUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs index c8cacc2..135a93b 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationEdit.aspx.cs @@ -285,7 +285,7 @@ namespace FineUIPro.Web.CQMS.Information Panel2.Enabled = false; VisaApplicationService.Init(drpHandleType, Const.VisaApplication_Audit6, false); var userList = from x in Funs.DB.Sys_User - where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true + where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true select x; drpHandleMan.DataValueField = "UserId"; drpHandleMan.DataTextField = "UserName"; @@ -305,7 +305,7 @@ namespace FineUIPro.Web.CQMS.Information Panel2.Enabled = false; VisaApplicationService.Init(drpHandleType, Const.VisaApplication_Audit7, false); var userList = from x in Funs.DB.Sys_User - where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true + where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true select x; drpHandleMan.DataValueField = "UserId"; drpHandleMan.DataTextField = "UserName"; @@ -1561,7 +1561,7 @@ namespace FineUIPro.Web.CQMS.Information else if (this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit7 || this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit8) { var userList = from x in Funs.DB.Sys_User - where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true + where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true select x; drpHandleMan.DataValueField = "UserId"; drpHandleMan.DataTextField = "UserName"; @@ -1638,7 +1638,7 @@ namespace FineUIPro.Web.CQMS.Information else if (this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit7 || this.drpHandleType.SelectedValue == BLL.Const.VisaApplication_Audit8) { var userList = from x in Funs.DB.Sys_User - where x.UnitId == BLL.Const.UnitId_TCC && x.IsOffice == true + where x.UnitId == BLL.Const.UnitId_XJYJ && x.IsOffice == true select x; drpHandleMan.DataValueField = "UserId"; drpHandleMan.DataTextField = "UserName"; diff --git a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationFinal.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationFinal.aspx.cs index 142fbc9..0aa5cc5 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationFinal.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/VisaApplicationFinal.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Information UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); btnNew.OnClientClick = Window1.GetShowReference("EditVisaApplicationFinal.aspx") + "return false;"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { this.drpProposeUnit.Hidden = true; } @@ -88,7 +88,7 @@ namespace FineUIPro.Web.CQMS.Information List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND solution.UnitId='" + this.CurrUser.UnitId+"'"; } diff --git a/SGGL/FineUIPro.Web/CQMS/Information/WorkOrderFinal.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Information/WorkOrderFinal.aspx.cs index fdc215a..3f2779d 100644 --- a/SGGL/FineUIPro.Web/CQMS/Information/WorkOrderFinal.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Information/WorkOrderFinal.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.CQMS.Information UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); btnNew.OnClientClick = Window1.GetShowReference("EditWorkOrderFinal.aspx") + "return false;"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { this.drpProposeUnit.Hidden = true; } @@ -89,7 +89,7 @@ namespace FineUIPro.Web.CQMS.Information List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND solution.UnitId='" + this.CurrUser.UnitId+"'"; } diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/QualityWorkSummaryReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/QualityWorkSummaryReportEdit.aspx.cs index 9b8e806..a2e8007 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/QualityWorkSummaryReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/QualityWorkSummaryReportEdit.aspx.cs @@ -143,7 +143,7 @@ namespace FineUIPro.Web.CQMS.ManageReport Model.InformationProject_QualityWorkSummaryReport report = new Model.InformationProject_QualityWorkSummaryReport { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, }; if (this.ddlYearId.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQualityEdit.aspx.cs index c4ee89c..4a4b91a 100644 --- a/SGGL/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQualityEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/QuarterlyProjectQualityEdit.aspx.cs @@ -178,7 +178,7 @@ namespace FineUIPro.Web.CQMS.ManageReport Model.InformationProject_QuarterlyProjectQuality quarterlyProjectQuality = new Model.InformationProject_QuarterlyProjectQuality { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, QualityManagePersonNum = Funs.GetNewInt(this.txtQualityManagePersonNum.Text.Trim()), AdvancedTitlePersonNum = Funs.GetNewInt(this.txtAdvancedTitlePersonNum.Text.Trim()), IntermediateTitlePersonNum = Funs.GetNewInt(this.txtIntermediateTitlePersonNum.Text.Trim()), diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs index 877b0f3..7d1c40c 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagement.aspx.cs @@ -59,7 +59,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl + @" WHERE P.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND P.UnitId='" + this.CurrUser.UnitId + "'"; } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs index 1b0fbdb..e8e6f75 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionManagementEdit.aspx.cs @@ -33,7 +33,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl join p in db.Project_ProjectUser on x.UserId equals p.UserId where p.RoleId.Contains(Const.ZBCNEngineer) - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; drpAudit.DataTextField = "UserName"; diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs index 2e9a66e..256a471 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNotice.aspx.cs @@ -58,7 +58,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl + @" WHERE P.ProjectId=@ProjectId "; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND P.UnitId='" + this.CurrUser.UnitId + "'"; } diff --git a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs index 2a4e038..b7157fa 100644 --- a/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/ProcessControl/InspectionNoticeEdit.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl drpUnit.DataBind(); drpUnit.SelectedValue = this.CurrUser.UnitId; - if ( this.CurrUser.UnitId==Const.UnitId_TCC|| this.CurrUser.UserId ==Const.hfnbdId) + if ( this.CurrUser.UnitId==Const.UnitId_XJYJ|| this.CurrUser.UserId ==Const.hfnbdId) { drpUnit.Enabled= true; } @@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl } drpMainSendUnit.DataValueField = "UnitId"; drpMainSendUnit.DataTextField = "UnitName"; - drpMainSendUnit.DataSource = Funs.DB.Base_Unit.Where(x => x.UnitId == Const.UnitId_TCC).ToList(); + drpMainSendUnit.DataSource = Funs.DB.Base_Unit.Where(x => x.UnitId == Const.UnitId_XJYJ).ToList(); drpMainSendUnit.DataBind(); drpMainSendUnit.SelectedValue = this.CurrUser.UnitId; @@ -61,7 +61,7 @@ namespace FineUIPro.Web.CQMS.ProcessControl on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName=x.UserName }; drpAudit.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs index b39b3cf..d16ebbe 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolution.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.CQMS.Solution CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true); UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); btnNew.OnClientClick = window_tt.GetShowReference("EditConstructSolution.aspx") + "return false;"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { this.drpProposeUnit.Hidden = true; } @@ -137,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Solution List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND chec.UnitId='" + this.CurrUser.UnitId + "'"; } diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs index 10f0c01..720e0fa 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/ConstructSolutionFinal.aspx.cs @@ -48,7 +48,7 @@ namespace FineUIPro.Web.CQMS.Solution UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpSolutionType, true); btnNew.OnClientClick = Window1.GetShowReference("EditConstructSolutionFinal.aspx") + "return false;"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { this.drpProposeUnit.Hidden = true; } @@ -90,7 +90,7 @@ namespace FineUIPro.Web.CQMS.Solution List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND solution.UnitId='" + this.CurrUser.UnitId+"'"; } diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs index 97acd7d..454107a 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolution.aspx.cs @@ -102,7 +102,7 @@ namespace FineUIPro.Web.CQMS.Solution BLL.SolutionTempleteTypeService.InitSolutionTempleteDropDownList(drpModelType, false); BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(drpSpecialType,1, false); UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { drpUnit.SelectedValue = this.CurrUser.UnitId; drpUnit.Enabled = false; diff --git a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolutionFinal.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolutionFinal.aspx.cs index 8ee92fc..3428713 100644 --- a/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolutionFinal.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/Solution/EditConstructSolutionFinal.aspx.cs @@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.Solution txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); ConstructSolutionId = Request.Params["constructSolutionId"]; this.State = "1"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { drpUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecordEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecordEdit.aspx.cs index 8066819..1023837 100644 --- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecordEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPointAuditRecordEdit.aspx.cs @@ -35,7 +35,7 @@ namespace FineUIPro.Web.CQMS.WBS var userList = from x in Funs.DB.Sys_User join p in Funs.DB.Project_ProjectUser on x.UserId equals p.UserId - where x.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId + where x.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId select new { UserId = x.UserId, UserName = x.UserName }; dpAuditer.DataValueField = "UserId"; dpAuditer.DataTextField = "UserName"; diff --git a/SGGL/FineUIPro.Web/Controls/UnitProjectTControl.ascx.cs b/SGGL/FineUIPro.Web/Controls/UnitProjectTControl.ascx.cs index 2cd1c9e..c10b6b1 100644 --- a/SGGL/FineUIPro.Web/Controls/UnitProjectTControl.ascx.cs +++ b/SGGL/FineUIPro.Web/Controls/UnitProjectTControl.ascx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.Controls { if (!IsPostBack) { - this.UnitId = this.UnitId ?? BLL.Const.UnitId_TCC; + this.UnitId = this.UnitId ?? BLL.Const.UnitId_XJYJ; this.ProjectId=this.ProjectId; ////加载树 SetSubUnitProjectTree(this.tvProject); @@ -100,7 +100,7 @@ namespace FineUIPro.Web.Controls public void SetSubUnitProjectTree(FineUIPro.Tree tvProject) { tvProject.Nodes.Clear(); - if (BLL.Const.UnitId_TCC == this.UnitId) + if (BLL.Const.UnitId_XJYJ == this.UnitId) { var getSubUnit = from x in Funs.DB.Base_Unit where x.UnitId == this.UnitId || x.IsBranch == true diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs index e830613..7e4c896 100644 --- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.DataShow BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); - this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）"; + this.Panel1.Title = "事故事件数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）"; } } diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs index bc99b1f..137fb67 100644 --- a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs @@ -28,7 +28,7 @@ namespace FineUIPro.Web.DataShow BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); - this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）"; + this.Panel1.Title = "安全监督检查数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）"; } } diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs index 912b1a2..b34d650 100644 --- a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.DataShow ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); // 绑定表格t BindGrid(); - this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）"; + this.Panel1.Title = "企业总部/分支机构安全人员（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）"; } } diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs index d42dbe0..8905e05 100644 --- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs @@ -26,7 +26,7 @@ namespace FineUIPro.Web.DataShow BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); - this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）"; + this.Panel1.Title = "施工机具设备（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）"; } } diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs index 9b15af3..46d9301 100644 --- a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs +++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.DataShow BLL.ProjectService.InitProjectDropDownList(this.drpProject, true); // 绑定表格t BindGrid(); - this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_TCC) + "）"; + this.Panel1.Title = "质量验收数据（" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_XJYJ) + "）"; } } #endregion diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls index 516bb43..76fb91c 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls and b/SGGL/FineUIPro.Web/File/Excel/DataIn/人员信息模版.xls differ diff --git a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs index f525267..24cfc1c 100644 --- a/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/CheckManage/CheckManage.aspx.cs @@ -127,7 +127,7 @@ namespace FineUIPro.Web.HJGL.CheckManage { this.drpUnit.Enabled = true; } - else if(this.CurrUser.UnitId !=Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId) + else if(this.CurrUser.UnitId !=Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId) { this.drpUnit.Enabled = false; } @@ -228,7 +228,7 @@ namespace FineUIPro.Web.HJGL.CheckManage rootUnitNode.Expanded = true; rootUnitNode.ToolTip = "施工单位"; rootNode.Nodes.Add(rootUnitNode); - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId&&!showAll) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId&&!showAll) { if (!string.IsNullOrEmpty(txtTrust.Text)) { diff --git a/SGGL/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs index c881ee7..eebc071 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs @@ -615,7 +615,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage this.drpInstallationId.SelectedIndex = 0; //加载编号 string prefixCode = string.Empty; - var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpHotHardUnit.SelectedValue); if (!string.IsNullOrEmpty(tccCode)) { @@ -640,7 +640,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage { //加载编号 string prefixCode = string.Empty; - var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpHotHardUnit.SelectedValue); var area = BLL.WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, this.drpInstallationId.SelectedValue, this.drpHotHardUnit.SelectedValue); if (!string.IsNullOrEmpty(tccCode)) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageByPipe.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageByPipe.aspx.cs index dc36e6f..cd998bf 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageByPipe.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageByPipe.aspx.cs @@ -598,7 +598,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage //加载编号 string prefixCode = string.Empty; - var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue); if (!string.IsNullOrEmpty(tccCode)) { @@ -623,7 +623,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage { //加载编号 string prefixCode = string.Empty; - var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue); var area = BLL.WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, this.drpInstallationId.SelectedValue, this.drpUnit.SelectedValue); if (!string.IsNullOrEmpty(tccCode)) diff --git a/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs index a2e924d..8d81061 100644 --- a/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs @@ -577,7 +577,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage //加载编号 string prefixCode = string.Empty; - var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue); if (!string.IsNullOrEmpty(tccCode)) { @@ -602,7 +602,7 @@ namespace FineUIPro.Web.HJGL.HotProessManage { //加载编号 string prefixCode = string.Empty; - var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + var tccCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); var unitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpUnit.SelectedValue); var area = BLL.WorkAreaService.GetWorkAreaByProjectIdAndInstalltionIdAndUnitId(this.CurrUser.LoginProjectId, this.drpInstallationId.SelectedValue, this.drpUnit.SelectedValue); if (!string.IsNullOrEmpty(tccCode)) diff --git a/SGGL/FineUIPro.Web/HJGL/MaterialManage/MaterialApplyEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/MaterialManage/MaterialApplyEdit.aspx.cs index 49e564f..98cb274 100644 --- a/SGGL/FineUIPro.Web/HJGL/MaterialManage/MaterialApplyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/MaterialManage/MaterialApplyEdit.aspx.cs @@ -65,7 +65,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage State = "1"; this.txtProjectName.Text = ProjectService.GetProjectNameByProjectId(CurrUser.LoginProjectId); UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.dpApplyUnit, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); - if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId) + if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId) { this.dpApplyUnit.SelectedValue = CurrUser.UnitId; this.dpApplyUnit.Enabled = false; @@ -84,7 +84,7 @@ namespace FineUIPro.Web.HJGL.MaterialManage on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpHandleMan.DataValueField = "UserId"; diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManage.aspx.cs index 3aaa053..ce932af 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManage.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web.HJGL.PersonManage BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true); var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); - if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC) + if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ) { drpUnitId.Enabled = true; } diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManageEdit.aspx.cs index a5bc6a6..0718a7b 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonEntranceManageEdit.aspx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.HJGL.PersonManage on x.UnitId equals y.UnitId join p in db.Project_ProjectUser on x.UserId equals p.UserId - where y.UnitId == Const.UnitId_TCC && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId + where y.UnitId == Const.UnitId_XJYJ && p.ProjectId == CurrUser.LoginProjectId && y.ProjectId == CurrUser.LoginProjectId where p.RoleId.Contains(Const.ZBCNEngineer) select new { UserId = x.UserId, UserName = x.UserName }; drpAudit.DataValueField = "UserId"; @@ -52,7 +52,7 @@ namespace FineUIPro.Web.HJGL.PersonManage drpRes.DataBind(); Funs.FineUIPleaseSelect(drpRes); - if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC) + if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ) { drpUnitId.Enabled = true; } diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs index 339c703..d92fb8c 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManage.aspx.cs @@ -24,7 +24,7 @@ namespace FineUIPro.Web.HJGL.PersonManage Funs.FineUIPleaseSelect(drpTeamGroupId); var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); - if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC) + if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ) { drpUnitId.Enabled = true; } diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.cs index 4661686..96e6938 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/PersonManageEdit.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.HJGL.PersonManage Funs.FineUIPleaseSelect(drpTeamGroupId); var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); - if (unit == null || unit.UnitId == BLL.Const.UnitId_TCC) + if (unit == null || unit.UnitId == BLL.Const.UnitId_XJYJ) { drpUnitId.Enabled = true; } diff --git a/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs b/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs index 33051d6..e21ed17 100644 --- a/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/PersonManage/TestApplication.aspx.cs @@ -104,7 +104,7 @@ namespace FineUIPro.Web.HJGL.PersonManage strSql += " AND testApplication.ExamDate <= @endDate"; listStr.Add(new SqlParameter("@endDate", this.txtEndDate.Text.Trim())); } - if (this.CurrUser.UnitId != BLL.Const.UnitId_TCC) + if (this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ) { var user = BLL.ProjectUserService.GetCurrProjectUserByUserId(this.CurrUser.UserId); if (user != null) diff --git a/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs index e11595c..6a3d013 100644 --- a/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/RepairManage/RepairManageEdit.aspx.cs @@ -67,7 +67,7 @@ namespace FineUIPro.Web.HJGL.RepairManage this.drpCH_TrustUnit.DataSource = pUnit; this.drpCH_TrustUnit.DataBind(); this.drpCH_TrustUnit.SelectedValue = this.CurrUser.UnitId; - if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId) + if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId) { this.drpCH_TrustUnit.Enabled = false; } @@ -1056,7 +1056,7 @@ namespace FineUIPro.Web.HJGL.RepairManage this.drpInstallationId.SelectedIndex = 0; //加载委托单号 string prefixCode = string.Empty; - var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); // var trustUnitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpCH_TrustUnit.SelectedValue); // prefixCode = "RK-" + epcUnitCode + "-" + trustUnitCode + "-"; @@ -1085,7 +1085,7 @@ namespace FineUIPro.Web.HJGL.RepairManage //{ // areaCode = workarea.WorkAreaCode; //} - //var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + //var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); //var trustUnitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpCH_TrustUnit.SelectedValue); //prefixCode = "RK-" + epcUnitCode + "-" + trustUnitCode + "-" + areaCode + "-"; @@ -1111,7 +1111,7 @@ namespace FineUIPro.Web.HJGL.RepairManage //{ // areaCode = workarea.WorkAreaCode; //} - //var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_TCC); + //var epcUnitCode = BLL.UnitService.GetUnitCodeByUnitId(BLL.Const.UnitId_XJYJ); //var trustUnitCode = BLL.UnitService.GetUnitCodeByUnitId(this.drpCH_TrustUnit.SelectedValue); //var ndtt = BLL.Base_DetectionTypeService.GetDetectionTypeByDetectionTypeId(this.drpCH_NDTMethod.SelectedValue); //if (ndtt != null) diff --git a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageEdit.aspx.cs index 579af9e..fad72bf 100644 --- a/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TestPackageManage/TestPackageManageEdit.aspx.cs @@ -60,7 +60,7 @@ namespace FineUIPro.Web.HJGL.TestPackageManage this.drpUnitId.DataSource = pUnit; this.drpUnitId.DataBind(); this.drpUnitId.SelectedValue = this.CurrUser.UnitId; - if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId) + if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId) { this.drpUnitId.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs index d74ec3f..72bb342 100644 --- a/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/TrustManage/TrustManageEditAdd.aspx.cs @@ -63,7 +63,7 @@ namespace FineUIPro.Web.HJGL.TrustManage this.drpCH_TrustUnit.DataBind(); this.drpCH_TrustUnit.SelectedValue = CurrUser.UnitId; - if (CurrUser.UnitId != Const.UnitId_TCC && CurrUser.UserId != Const.hfnbdId) + if (CurrUser.UnitId != Const.UnitId_XJYJ && CurrUser.UserId != Const.hfnbdId) { this.drpCH_TrustUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs index b5ce310..59bf533 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs @@ -69,7 +69,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.drpUnit.DataSource = pUnit; this.drpUnit.DataBind(); this.drpUnit.SelectedValue = this.CurrUser.UnitId; - if(this.CurrUser.UnitId!=Const.UnitId_TCC && this.CurrUser.UserId!=Const.hfnbdId) + if(this.CurrUser.UnitId!=Const.UnitId_XJYJ && this.CurrUser.UserId!=Const.hfnbdId) { this.drpUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx.cs index cd6eb8f..bad4cf3 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportDataIn.aspx.cs @@ -40,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { ///施工区域下拉 var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); - if (unit != null&& unit.UnitId!=Const.UnitId_TCC) + if (unit != null&& unit.UnitId!=Const.UnitId_XJYJ) { BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); var getpu = ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, unit.UnitId); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 9d38bcd..cc83a87 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -94,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.drpUnit.DataBind(); this.drpUnit.SelectedValue = this.hdUnitId.Text; - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId) { this.drpUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs index 1f4b671..eae36ea 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DetectionAnalyze.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 //var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); this.drpUnit.SelectedValue = this.CurrUser.UnitId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs index 49d9460..4569f13 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCmprehensive.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 // var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); // if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2) - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); this.drpUnit.SelectedValue = this.CurrUser.UnitId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs index 3a83302..3153016 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/IsoCompreInfo.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 // var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); // if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2) - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { BLL.WorkAreaService.InitWorkAreaProjectUnitDropDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); } @@ -69,7 +69,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport strSql += " AND WorkAreaId =@workareaId"; listStr.Add(new SqlParameter("@workareaId", this.drpWorkArea.SelectedValue)); } - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId) { strSql += " AND UnitId = @UnitId"; listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId)); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs index 8d5d38d..4af96f9 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/JointComprehensive.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 // var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); // if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2) - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { //BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); //this.drpUnit.SelectedValue = this.CurrUser.UnitId; @@ -84,7 +84,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport listStr.Add(new SqlParameter("@workareaId", this.drpWorkArea.SelectedValue)); } - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId) { strSql += " AND v.UnitId = @UnitId"; listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId)); @@ -180,7 +180,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport listStr.Add(new SqlParameter("@workareaId", this.drpWorkArea.SelectedValue)); } - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UserId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UserId != Const.hfnbdId) { strSql += " AND v.UnitId = @UnitId"; listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId)); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs index a7f6a36..ef6044f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/MediaComprehensive.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 // var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); // if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2) - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); this.drpUnit.SelectedValue = this.CurrUser.UnitId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs index 13e52be..98a5398 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/PrefabricatedInstall.aspx.cs @@ -26,7 +26,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 //var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); - if (this.CurrUser.UnitId!=Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId!=Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); this.drpUnit.SelectedValue = this.CurrUser.UnitId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs index 43cdbc6..5d7ae7d 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/TrustCheck.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 // var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); // if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2) - if (this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); this.drpUnit.SelectedValue = this.CurrUser.UnitId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs index 2215b17..4caec37 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/WelderPerformance.aspx.cs @@ -31,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport //单位 // var unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); //if (unit != null && unit.UnitTypeId == BLL.Const.ProjectUnitType_2) - if (this.CurrUser.UnitId!=Const.UnitId_TCC&&this.CurrUser.UserId!=Const.hfnbdId) + if (this.CurrUser.UnitId!=Const.UnitId_XJYJ&&this.CurrUser.UserId!=Const.hfnbdId) { BLL.UnitService.InitSubUnitNameDownList(this.drpUnit, this.CurrUser.LoginProjectId, this.CurrUser.UnitId, true); this.drpUnit.SelectedValue = this.CurrUser.UnitId; diff --git a/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherEdit.aspx.cs index 30f4d9f..2fa40a7 100644 --- a/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherEdit.aspx.cs @@ -41,7 +41,7 @@ namespace FineUIPro.Web.HSSE.Accident if (!IsPostBack) { Funs.DropDownPageSize(this.ddlPageSize); - var unit = UnitService.GetUnitByUnitId(Const.UnitId_TCC); + var unit = UnitService.GetUnitByUnitId(Const.UnitId_XJYJ); if (unit != null && !string.IsNullOrEmpty(unit.UnitCode)) { string url = "../../Images/SUBimages/" + unit.UnitCode + ".jpg"; diff --git a/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherView.aspx.cs index 0bbf9c3..4a1afba 100644 --- a/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Accident/AccidentReportOtherView.aspx.cs @@ -40,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Accident { if (!IsPostBack) { - var thisunit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_TCC); + var thisunit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_XJYJ); if (thisunit != null && !string.IsNullOrEmpty(thisunit.UnitCode)) { string url = "../../Images/SUBimages/" + thisunit.UnitCode + ".jpg"; diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckWorkEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckWorkEdit.aspx.cs index 3b63474..1a8276e 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/CheckWorkEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckWorkEdit.aspx.cs @@ -124,7 +124,7 @@ namespace FineUIPro.Web.HSSE.Check this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); //var thisUnit = BLL.CommonService.GetIsThisUnit(); //if (thisUnit != null && thisUnit.UnitId == Const.UnitId_CWCEC) - if (this.CurrUser.UnitId == Const.UnitId_TCC) + if (this.CurrUser.UnitId == Const.UnitId_XJYJ) { SaveNew(true); } diff --git a/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeAdd.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeAdd.aspx.cs index 4b1fccc..70dd07d 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeAdd.aspx.cs @@ -88,7 +88,7 @@ namespace FineUIPro.Web.HSSE.Check Funs.FineUIPleaseSelect(this.drpTeamGroup); Funs.FineUIPleaseSelect(this.drpPerson); BLL.ConstValue.InitConstValueDropDownList(this.drpRewardType, BLL.ConstValue.Group_RewardType, true); - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); //BindGrid(string.Empty); this.IncentiveNoticeId = Request.Params["IncentiveNoticeId"]; this.txtCurrency.Text = "人民币"; diff --git a/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeEdit.aspx.cs index aa34201..d24c315 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/IncentiveNoticeEdit.aspx.cs @@ -149,14 +149,14 @@ namespace FineUIPro.Web.HSSE.Check { this.IsAgree.Hidden = false; this.GroupPanel2.Hidden = false; - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理 this.drpHandleMan.Label = "总包项目经理"; if (!string.IsNullOrEmpty(incentiveNotice.ApproveMan)) { this.drpHandleMan.SelectedValue = incentiveNotice.ApproveMan; } - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理 BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);//分包单位 } @@ -348,7 +348,7 @@ namespace FineUIPro.Web.HSSE.Check this.NoAgree.Hidden = true; if (State == "1") { - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理 this.drpHandleMan.Label = "总包项目经理"; this.GroupPanel2.Hidden = false; } diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeAdd.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeAdd.aspx.cs index 2c93e5f..0a67c03 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeAdd.aspx.cs @@ -71,7 +71,7 @@ namespace FineUIPro.Web.HSSE.Check this.ProjectId = this.CurrUser.LoginProjectId; this.PauseNoticeId = Request.Params["PauseNoticeId"]; this.InitDropDownList(); - BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC,Const.ConstructionManager, true); + BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ,Const.ConstructionManager, true); if (!string.IsNullOrEmpty(PauseNoticeId)) { diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeEdit.aspx.cs index 77e924e..a1689ad 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PauseNoticeEdit.aspx.cs @@ -118,16 +118,16 @@ namespace FineUIPro.Web.HSSE.Check { this.IsAgree.Hidden = false; - //UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); - BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, Const.ProjectManager, true); + //UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); + BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, Const.ProjectManager, true); this.drpHandleMan.Label = "总包项目经理"; if (!string.IsNullOrEmpty(pauseNotice.ApproveManId)) { this.drpHandleMan.SelectedValue = pauseNotice.ApproveManId; } this.GroupPanel2.Hidden = false; - gvCarryUser.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, Const.UnitId_TCC); + gvCarryUser.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, Const.UnitId_XJYJ); gvCarryUser.DataBind();//专业工程师 - BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, Const.ConstructionManager, true); + BLL.UserService.InitUserProjectIdUnitIdRoleIdDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, Const.ConstructionManager, true); //施工经理 //UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, true);//分包单位 girdConMan.DataSource = BLL.UserService.GetProjectRoleUserListByProjectId(this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue); @@ -442,7 +442,7 @@ namespace FineUIPro.Web.HSSE.Check this.NoAgree.Hidden = true; if (State == "1") { - UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); this.drpHandleMan.Label = "总包项目经理"; this.GroupPanel2.Hidden = false; } diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs index 5e5e6c9..783c3d4 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeAdd.aspx.cs @@ -60,8 +60,8 @@ namespace FineUIPro.Web.HSSE.Check this.InitDropDownList(); this.PunishNoticeId = Request.Params["PunishNoticeId"]; this.txtCurrency.Text = "人民币"; - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); if (!string.IsNullOrEmpty(this.PunishNoticeId)) { BindGrid(); @@ -495,7 +495,7 @@ namespace FineUIPro.Web.HSSE.Check } else { - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpPunishPersonId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); } } } diff --git a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs index 1037ed8..c5cd1c6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/PunishNoticeEdit.aspx.cs @@ -133,14 +133,14 @@ namespace FineUIPro.Web.HSSE.Check { this.IsAgree.Hidden = false; this.GroupPanel2.Hidden = false; - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包项目经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包项目经理 this.drpHandleMan.Label = "总包施工经理"; if (!string.IsNullOrEmpty(punishNotice.ApproveMan)) { this.drpHandleMan.SelectedValue = punishNotice.ApproveMan; } - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理 BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpUnitHeadMan, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);//分包单位 } @@ -430,7 +430,7 @@ namespace FineUIPro.Web.HSSE.Check this.NoAgree.Hidden = true; if (State == "1") { - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//总包施工经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpHandleMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//总包施工经理 this.drpHandleMan.Label = "总包施工经理"; this.GroupPanel2.Hidden = false; } diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs index 305cf60..0792722 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs @@ -36,11 +36,11 @@ namespace FineUIPro.Web.HSSE.Check { RectifyNoticesId = Request.Params["RectifyNoticesId"]; /// 专业工程师 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); /// 施工经理 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); /// 项目经理 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); var getRectifyNotices = RectifyNoticesService.GetRectifyNoticesById(RectifyNoticesId); if (getRectifyNotices != null) { @@ -292,7 +292,7 @@ namespace FineUIPro.Web.HSSE.Check //else if (getRectifyNotices.States == Const.State_3) //{ // this.drpOperateMan.Label = "安全经理/安全工程师"; - // UserService.InitUserProjectIdUnitIdDropDownList(this.drpOperateMan, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + // UserService.InitUserProjectIdUnitIdDropDownList(this.drpOperateMan, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); // this.drpOperateMan.SelectedValue = getRectifyNotices.CompleteManId; //} } diff --git a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs index fce309c..cd81d2f 100644 --- a/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs @@ -63,7 +63,7 @@ namespace FineUIPro.Web.HSSE.Check //区域 BLL.UnitWorkService.InitUnitWorkDownList(this.drpWorkAreaId, this.CurrUser.LoginProjectId, true); ///安全经理 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); ///检察人员 BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true); @@ -138,9 +138,9 @@ namespace FineUIPro.Web.HSSE.Check //this.Itemcontent.Hidden = true; //this.btnSure.Hidden = true; BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpDutyPerson, this.CurrUser.LoginProjectId, this.drpUnitId.SelectedValue, true);//接收人 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//专业工程师 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//施工经理 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true);//项目经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProfessionalEngineer, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//专业工程师 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpConstructionManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//施工经理 + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpProjectManager, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true);//项目经理 var datas = Grid1.GetMergedData(); if (datas != null) @@ -234,7 +234,7 @@ namespace FineUIPro.Web.HSSE.Check //this.Itemcontent.Hidden = true; //this.btnSure.Hidden = true; //复查人 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); this.drpCheckPerson.SelectedValue = RectifyNotices.CompleteManId; } else if (State == "4") diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationEdit.aspx.cs index c7dd457..1b858e3 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/PayRegistrationEdit.aspx.cs @@ -681,7 +681,7 @@ namespace FineUIPro.Web.HSSE.CostGoods if (string.IsNullOrEmpty(payRegistration.UnitId)) { - payRegistration.UnitId = BLL.Const.UnitId_TCC; + payRegistration.UnitId = BLL.Const.UnitId_XJYJ; } if (!string.IsNullOrEmpty(this.PayRegistrationId)) { diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistrationEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistrationEdit.aspx.cs index efa1a55..4f7c6de 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistrationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/SubPayRegistrationEdit.aspx.cs @@ -38,7 +38,7 @@ namespace FineUIPro.Web.HSSE.CostGoods ///单位下拉框 BLL.UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, false); Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(this.CurrUser.UnitId); - if (unit == null || (unit != null && unit.UnitId == BLL.Const.UnitId_TCC)) + if (unit == null || (unit != null && unit.UnitId == BLL.Const.UnitId_XJYJ)) { this.txtSMainApproveType1.Readonly = false; this.txtSMainApproveType2.Readonly = false; @@ -353,7 +353,7 @@ namespace FineUIPro.Web.HSSE.CostGoods this.txtSMonthTypeTotal7.Text = Convert.ToString(sMonthType29);//文明施工和环境保护 当月累计 费用小计 this.txtSMonthTypeTotal.Text = Convert.ToString(Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal1.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal2.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal3.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal4.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal5.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal6.Text) + Funs.GetNewDecimalOrZero(this.txtSMonthTypeTotal7.Text)); } - if (unit != null && unit.UnitId != BLL.Const.UnitId_TCC) + if (unit != null && unit.UnitId != BLL.Const.UnitId_XJYJ) { this.drpUnit.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/HSSE/CostGoods/TotalPayRegistrationView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/CostGoods/TotalPayRegistrationView.aspx.cs index 8f6a36f..eca0638 100644 --- a/SGGL/FineUIPro.Web/HSSE/CostGoods/TotalPayRegistrationView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/CostGoods/TotalPayRegistrationView.aspx.cs @@ -72,7 +72,7 @@ namespace FineUIPro.Web.HSSE.CostGoods int b = 5; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row1[b] = payRegistrations.Sum(x => x.SMonthType1_1 ?? 0); row1[b] = Funs.GetNewDecimalOrZero(row1[b].ToString()).ToString("N2"); @@ -101,7 +101,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row2[4] = "施工现场和特殊界区管理出入证、通行证制证、制卡"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row2[b] = payRegistrations.Sum(x => x.SMonthType1_2 ?? 0); row2[b] = Funs.GetNewDecimalOrZero(row2[b].ToString()).ToString("N2"); @@ -130,7 +130,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row3[4] = "安全、环保、应急管理文档汇集、编辑、分析"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row3[b] = payRegistrations.Sum(x => x.SMonthType1_3 ?? 0); row3[b] = Funs.GetNewDecimalOrZero(row3[b].ToString()).ToString("N2"); @@ -159,7 +159,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row4[4] = "安全检测、监测、评定、评价"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row4[b] = payRegistrations.Sum(x => x.SMonthType1_4 ?? 0); row4[b] = Funs.GetNewDecimalOrZero(row4[b].ToString()).ToString("N2"); @@ -188,7 +188,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row5[4] = "报刊、标语、参考书、宣传画、音像制品等宣传品和现场宣传栏"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row5[b] = payRegistrations.Sum(x => x.SMonthType1_5 ?? 0); row5[b] = Funs.GetNewDecimalOrZero(row5[b].ToString()).ToString("N2"); @@ -217,7 +217,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row6[4] = "员工进出场信息采集识别管理系统（含摄录存取及分析器材）购置、折旧或租赁费"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row6[b] = payRegistrations.Sum(x => x.SMonthType1_6 ?? 0); row6[b] = Funs.GetNewDecimalOrZero(row6[b].ToString()).ToString("N2"); @@ -246,7 +246,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row7[4] = "射线、风速、噪声、温湿度、粉尘、空气质量检测仪器购置、折旧或租赁费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row7[b] = payRegistrations.Sum(x => x.SMonthType1_7 ?? 0); row7[b] = Funs.GetNewDecimalOrZero(row7[b].ToString()).ToString("N2"); @@ -275,7 +275,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row8[4] = "气液成分、电气安全、力学特性、热工特性和几何量检测仪器购置、折旧或租赁费"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row8[b] = payRegistrations.Sum(x => x.SMonthType1_8 ?? 0); row8[b] = Funs.GetNewDecimalOrZero(row8[b].ToString()).ToString("N2"); @@ -304,7 +304,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row9[4] = "监测、检测辅助器具"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row9[b] = payRegistrations.Sum(x => x.SMonthType1_9 ?? 0); row9[b] = Funs.GetNewDecimalOrZero(row9[b].ToString()).ToString("N2"); @@ -333,7 +333,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row10[4] = "警戒警示通讯器材（对讲机、望远镜、测距仪）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row10[b] = payRegistrations.Sum(x => x.SMonthType1_10 ?? 0); row10[b] = Funs.GetNewDecimalOrZero(row10[b].ToString()).ToString("N2"); @@ -362,7 +362,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row11[4] = "监测检测计量器具执行检定和维修费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row11[b] = payRegistrations.Sum(x => x.SMonthType1_11 ?? 0); row11[b] = Funs.GetNewDecimalOrZero(row11[b].ToString()).ToString("N2"); @@ -391,7 +391,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row12[4] = "风险突出处安全警示标志牌、警示灯、警戒线、提示牌等"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row12[b] = payRegistrations.Sum(x => x.SMonthType1_12 ?? 0); row12[b] = Funs.GetNewDecimalOrZero(row12[b].ToString()).ToString("N2"); @@ -420,7 +420,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row13[4] = "各工种、各类施工机械的安全操作规程牌"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row13[b] = payRegistrations.Sum(x => x.SMonthType1_13 ?? 0); row13[b] = Funs.GetNewDecimalOrZero(row13[b].ToString()).ToString("N2"); @@ -449,7 +449,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row14[4] = "特殊标识、标识设置"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row14[b] = payRegistrations.Sum(x => x.SMonthType1_14 ?? 0); row14[b] = Funs.GetNewDecimalOrZero(row14[b].ToString()).ToString("N2"); @@ -478,7 +478,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row15[4] = "表彰安全先进集体、个人的奖励"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row15[b] = payRegistrations.Sum(x => x.SMonthType1_15 ?? 0); row15[b] = Funs.GetNewDecimalOrZero(row15[b].ToString()).ToString("N2"); @@ -507,7 +507,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row16[4] = "其它安全生产管理直接相关的支出"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row16[b] = payRegistrations.Sum(x => x.SMonthType1_16 ?? 0); row16[b] = Funs.GetNewDecimalOrZero(row16[b].ToString()).ToString("N2"); @@ -536,7 +536,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row17[4] = "费用小计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row17[b] = payRegistrations.Sum(x => x.SMonthType1_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_6 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_7 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_8 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_9 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_10 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_11 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_12 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_13 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_14 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_15 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_16 ?? 0); row17[b] = Funs.GetNewDecimalOrZero(row17[b].ToString()).ToString("N2"); @@ -567,7 +567,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row18[4] = "专项方案中非常规安全措施费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row18[b] = payRegistrations.Sum(x => x.SMonthType2_1 ?? 0); row18[b] = Funs.GetNewDecimalOrZero(row18[b].ToString()).ToString("N2"); @@ -596,7 +596,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row19[4] = "与安全相关的专项方案专家论证审查费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row19[b] = payRegistrations.Sum(x => x.SMonthType2_2 ?? 0); row19[b] = Funs.GetNewDecimalOrZero(row19[b].ToString()).ToString("N2"); @@ -625,7 +625,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row20[4] = "各类安全技术方案的编制和咨询费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row20[b] = payRegistrations.Sum(x => x.SMonthType2_3 ?? 0); row20[b] = Funs.GetNewDecimalOrZero(row20[b].ToString()).ToString("N2"); @@ -654,7 +654,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row21[4] = "安全技术进步专项费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row21[b] = payRegistrations.Sum(x => x.SMonthType2_4 ?? 0); row21[b] = Funs.GetNewDecimalOrZero(row21[b].ToString()).ToString("N2"); @@ -683,7 +683,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row22[4] = "费用小计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row22[b] = payRegistrations.Sum(x => x.SMonthType2_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_4 ?? 0); row22[b] = Funs.GetNewDecimalOrZero(row22[b].ToString()).ToString("N2"); @@ -714,7 +714,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row23[4] = "通风、降温、保暖、除尘、防眩光设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row23[b] = payRegistrations.Sum(x => x.SMonthType3_1 ?? 0); row23[b] = Funs.GetNewDecimalOrZero(row23[b].ToString()).ToString("N2"); @@ -743,7 +743,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row24[4] = "职业病预防措施和有害作业工种保健费"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row24[b] = payRegistrations.Sum(x => x.SMonthType3_2 ?? 0); row24[b] = Funs.GetNewDecimalOrZero(row24[b].ToString()).ToString("N2"); @@ -772,7 +772,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row25[4] = "特殊环境作业和特殊要求行业人员体检费"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row25[b] = payRegistrations.Sum(x => x.SMonthType3_3 ?? 0); row25[b] = Funs.GetNewDecimalOrZero(row25[b].ToString()).ToString("N2"); @@ -801,7 +801,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row26[4] = "女工休息室、特殊作业人员休息室"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row26[b] = payRegistrations.Sum(x => x.SMonthType3_4 ?? 0); row26[b] = Funs.GetNewDecimalOrZero(row26[b].ToString()).ToString("N2"); @@ -830,7 +830,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row27[4] = "水泥等其他易飞扬颗粒建筑材料封闭放置和遮盖措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row27[b] = payRegistrations.Sum(x => x.SMonthType3_5 ?? 0); row27[b] = Funs.GetNewDecimalOrZero(row27[b].ToString()).ToString("N2"); @@ -859,7 +859,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row28[4] = "边角余料，废旧材料清理回收措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row28[b] = payRegistrations.Sum(x => x.SMonthType3_6 ?? 0); row28[b] = Funs.GetNewDecimalOrZero(row28[b].ToString()).ToString("N2"); @@ -888,7 +888,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row29[4] = "费用小计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row29[b] = payRegistrations.Sum(x => x.SMonthType3_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType3_6 ?? 0); row29[b] = Funs.GetNewDecimalOrZero(row29[b].ToString()).ToString("N2"); @@ -919,7 +919,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row30[4] = "漏电保护器"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row30[b] = payRegistrations.Sum(x => x.SMonthType4_1 ?? 0); row30[b] = Funs.GetNewDecimalOrZero(row30[b].ToString()).ToString("N2"); @@ -948,7 +948,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row31[4] = "保护接地装置，大型机具设备的防雷接地"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row31[b] = payRegistrations.Sum(x => x.SMonthType4_2 ?? 0); row31[b] = Funs.GetNewDecimalOrZero(row31[b].ToString()).ToString("N2"); @@ -977,7 +977,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row32[4] = "受限空间使用的低压照明设备（隔离变压器、低压照明灯、专用配电箱）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row32[b] = payRegistrations.Sum(x => x.SMonthType4_3 ?? 0); row32[b] = Funs.GetNewDecimalOrZero(row32[b].ToString()).ToString("N2"); @@ -1006,7 +1006,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row33[4] = "基坑及安全措施费隐蔽工程动土安全措施费（防坍塌措施）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row33[b] = payRegistrations.Sum(x => x.SMonthType4_4 ?? 0); row33[b] = Funs.GetNewDecimalOrZero(row33[b].ToString()).ToString("N2"); @@ -1035,7 +1035,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row34[4] = "孔、洞、井的防护盖板和防护栏杆"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row34[b] = payRegistrations.Sum(x => x.SMonthType4_5 ?? 0); row34[b] = Funs.GetNewDecimalOrZero(row34[b].ToString()).ToString("N2"); @@ -1064,7 +1064,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row35[4] = "其它临边防护材料（如安全网、踢脚板等）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row35[b] = payRegistrations.Sum(x => x.SMonthType4_6 ?? 0); row35[b] = Funs.GetNewDecimalOrZero(row35[b].ToString()).ToString("N2"); @@ -1093,7 +1093,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row36[4] = "有防坠物要求的棚房设施建筑物临边和施工通道的隔离防护棚"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row36[b] = payRegistrations.Sum(x => x.SMonthType4_7 ?? 0); row36[b] = Funs.GetNewDecimalOrZero(row36[b].ToString()).ToString("N2"); @@ -1122,7 +1122,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row37[4] = "防坠物措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row37[b] = payRegistrations.Sum(x => x.SMonthType4_8 ?? 0); row37[b] = Funs.GetNewDecimalOrZero(row37[b].ToString()).ToString("N2"); @@ -1151,7 +1151,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row38[4] = "钢结构安装时脚手架等安全措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row38[b] = payRegistrations.Sum(x => x.SMonthType4_9 ?? 0); row38[b] = Funs.GetNewDecimalOrZero(row38[b].ToString()).ToString("N2"); @@ -1180,7 +1180,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row39[4] = "高处作业下方区域警戒围护"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row39[b] = payRegistrations.Sum(x => x.SMonthType4_10 ?? 0); row39[b] = Funs.GetNewDecimalOrZero(row39[b].ToString()).ToString("N2"); @@ -1209,7 +1209,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row40[4] = "其他高处作业安全措施（注：脚手架体、爬梯和通道等施工必要设施不属于安全防护措施，但护栏、安全网、挡脚板、生命线等属于安全防护措施）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row40[b] = payRegistrations.Sum(x => x.SMonthType4_11 ?? 0); row40[b] = Funs.GetNewDecimalOrZero(row40[b].ToString()).ToString("N2"); @@ -1238,7 +1238,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row41[4] = "为确保建构筑物、钢构、设备施工安全而搭设的操作平台的防护栏杆和踢脚板；洞口临边护栏和盖板、平网、立网（密网）；安全通道的侧护栏和防砸顶板等。"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row41[b] = payRegistrations.Sum(x => x.SMonthType4_12 ?? 0); row41[b] = Funs.GetNewDecimalOrZero(row41[b].ToString()).ToString("N2"); @@ -1267,7 +1267,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row42[4] = "通风、降温、防触电和消防设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row42[b] = payRegistrations.Sum(x => x.SMonthType4_13 ?? 0); row42[b] = Funs.GetNewDecimalOrZero(row42[b].ToString()).ToString("N2"); @@ -1296,7 +1296,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row43[4] = "安全电压照明系统"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row43[b] = payRegistrations.Sum(x => x.SMonthType4_14 ?? 0); row43[b] = Funs.GetNewDecimalOrZero(row43[b].ToString()).ToString("N2"); @@ -1325,7 +1325,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row44[4] = "支护作业平台及防坠落、防滑设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row44[b] = payRegistrations.Sum(x => x.SMonthType4_15 ?? 0); row44[b] = Funs.GetNewDecimalOrZero(row44[b].ToString()).ToString("N2"); @@ -1354,7 +1354,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row45[4] = "气瓶固定、防晒、防砸措施（气瓶笼或气瓶架）；气瓶检漏措施；防回火设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row45[b] = payRegistrations.Sum(x => x.SMonthType4_16 ?? 0); row45[b] = Funs.GetNewDecimalOrZero(row45[b].ToString()).ToString("N2"); @@ -1383,7 +1383,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row46[4] = "高处动火的接火措施、挡火措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row46[b] = payRegistrations.Sum(x => x.SMonthType4_17 ?? 0); row46[b] = Funs.GetNewDecimalOrZero(row46[b].ToString()).ToString("N2"); @@ -1412,7 +1412,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row47[4] = "火源及溅落区附件设备、电缆、管道、电气、仪表等覆盖保护措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row47[b] = payRegistrations.Sum(x => x.SMonthType4_18 ?? 0); row47[b] = Funs.GetNewDecimalOrZero(row47[b].ToString()).ToString("N2"); @@ -1441,7 +1441,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row48[4] = "中小型机具安全附件维护，使用保护（安全锁钩、护套）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row48[b] = payRegistrations.Sum(x => x.SMonthType4_19 ?? 0); row48[b] = Funs.GetNewDecimalOrZero(row48[b].ToString()).ToString("N2"); @@ -1470,7 +1470,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row49[4] = "塔吊、吊车、物料提升机、施工电梯等的各种防护装置和保险装置（如安全门、安全钩、限位器、限制器、安全制动器、安全监控器等）检查维护费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row49[b] = payRegistrations.Sum(x => x.SMonthType4_20 ?? 0); row49[b] = Funs.GetNewDecimalOrZero(row49[b].ToString()).ToString("N2"); @@ -1499,7 +1499,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row50[4] = "机械设备、电器设备等传动部分为安全增设的安全防护装置及自动开关配置费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row50[b] = payRegistrations.Sum(x => x.SMonthType4_21 ?? 0); row50[b] = Funs.GetNewDecimalOrZero(row50[b].ToString()).ToString("N2"); @@ -1528,7 +1528,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row51[4] = "锅炉、压力容器、压缩机及各种有爆炸危险的保险装置检查维护费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row51[b] = payRegistrations.Sum(x => x.SMonthType4_22 ?? 0); row51[b] = Funs.GetNewDecimalOrZero(row51[b].ToString()).ToString("N2"); @@ -1557,7 +1557,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row52[4] = "为安全生产采取的信号装置、报警装置维护检查费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row52[b] = payRegistrations.Sum(x => x.SMonthType4_23 ?? 0); row52[b] = Funs.GetNewDecimalOrZero(row52[b].ToString()).ToString("N2"); @@ -1586,7 +1586,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row53[4] = "现场拆封、检查、安装准备工作所需要脚手架平台"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row53[b] = payRegistrations.Sum(x => x.SMonthType4_24 ?? 0); row53[b] = Funs.GetNewDecimalOrZero(row53[b].ToString()).ToString("N2"); @@ -1615,7 +1615,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row54[4] = "吸尘、降尘系统"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row54[b] = payRegistrations.Sum(x => x.SMonthType4_25 ?? 0); row54[b] = Funs.GetNewDecimalOrZero(row54[b].ToString()).ToString("N2"); @@ -1644,7 +1644,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row55[4] = "封固、隔离、保护设施及临时平台、通道搭设"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row55[b] = payRegistrations.Sum(x => x.SMonthType4_26 ?? 0); row55[b] = Funs.GetNewDecimalOrZero(row55[b].ToString()).ToString("N2"); @@ -1673,7 +1673,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row56[4] = "动土作业时的人工探挖、探查等措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row56[b] = payRegistrations.Sum(x => x.SMonthType4_27 ?? 0); row56[b] = Funs.GetNewDecimalOrZero(row56[b].ToString()).ToString("N2"); @@ -1702,7 +1702,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row57[4] = "车辆阻火器和施工机具、临时用电设备、照明设备、锤击工具防爆设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row57[b] = payRegistrations.Sum(x => x.SMonthType4_28 ?? 0); row57[b] = Funs.GetNewDecimalOrZero(row57[b].ToString()).ToString("N2"); @@ -1731,7 +1731,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row58[4] = "地沟、阀门井、排污井等封闭、冲洗"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row58[b] = payRegistrations.Sum(x => x.SMonthType4_29 ?? 0); row58[b] = Funs.GetNewDecimalOrZero(row58[b].ToString()).ToString("N2"); @@ -1760,7 +1760,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row59[4] = "施工区域与生产的空间隔离和系统隔离及警戒措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row59[b] = payRegistrations.Sum(x => x.SMonthType4_30 ?? 0); row59[b] = Funs.GetNewDecimalOrZero(row59[b].ToString()).ToString("N2"); @@ -1789,7 +1789,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row60[4] = "清污、限污所用器材专用安全防护器材和隔离设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row60[b] = payRegistrations.Sum(x => x.SMonthType4_31 ?? 0); row60[b] = Funs.GetNewDecimalOrZero(row60[b].ToString()).ToString("N2"); @@ -1818,7 +1818,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row61[4] = "消音及噪声隔离设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row61[b] = payRegistrations.Sum(x => x.SMonthType4_32 ?? 0); row61[b] = Funs.GetNewDecimalOrZero(row61[b].ToString()).ToString("N2"); @@ -1847,7 +1847,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row62[4] = "特种作业防护服，绝缘鞋，酸碱，绝缘手套，焊工面罩，鞋盖，护膝，护袖，披肩，各种专用防护眼镜，面罩，绝缘靴，自主呼吸器，防毒面具等，安全帽、安全带等"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row62[b] = payRegistrations.Sum(x => x.SMonthType4_33 ?? 0); row62[b] = Funs.GetNewDecimalOrZero(row62[b].ToString()).ToString("N2"); @@ -1876,7 +1876,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row63[4] = "灭火器、灭火器箱、水带、消防池、消防铲、消防桶、太平斧、消防器材架等"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row63[b] = payRegistrations.Sum(x => x.SMonthType4_34 ?? 0); row63[b] = Funs.GetNewDecimalOrZero(row63[b].ToString()).ToString("N2"); @@ -1905,7 +1905,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row64[4] = "防火毯、防火布、接火盆、挡火板、挡风用三防布、临时消防水管安装、拆除"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row64[b] = payRegistrations.Sum(x => x.SMonthType4_35 ?? 0); row64[b] = Funs.GetNewDecimalOrZero(row64[b].ToString()).ToString("N2"); @@ -1934,7 +1934,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row65[4] = "应急器材及演练器材动用费用、消耗费用和工时损失费用等"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row65[b] = payRegistrations.Sum(x => x.SMonthType4_36 ?? 0); row65[b] = Funs.GetNewDecimalOrZero(row65[b].ToString()).ToString("N2"); @@ -1963,7 +1963,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row66[4] = "应急淋浴和洗眼器、酸碱灼伤专用药品等现场医务室应急器材和消防、救护车辆"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row66[b] = payRegistrations.Sum(x => x.SMonthType4_37 ?? 0); row66[b] = Funs.GetNewDecimalOrZero(row66[b].ToString()).ToString("N2"); @@ -1992,7 +1992,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row67[4] = "风雨季、沙尘暴、雷击、地质灾害、大水体防护和防洪特殊环境及临时处置费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row67[b] = payRegistrations.Sum(x => x.SMonthType4_38 ?? 0); row67[b] = Funs.GetNewDecimalOrZero(row67[b].ToString()).ToString("N2"); @@ -2021,7 +2021,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row68[4] = "雨季、台风、沙尘暴等恶劣天气下，加固临时设施、大型施工机具等费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row68[b] = payRegistrations.Sum(x => x.SMonthType4_39 ?? 0); row68[b] = Funs.GetNewDecimalOrZero(row68[b].ToString()).ToString("N2"); @@ -2050,7 +2050,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row69[4] = "其他"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row69[b] = payRegistrations.Sum(x => x.SMonthType4_40 ?? 0); row69[b] = Funs.GetNewDecimalOrZero(row69[b].ToString()).ToString("N2"); @@ -2079,7 +2079,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row70[4] = "费用小计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row70[b] = payRegistrations.Sum(x => x.SMonthType4_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_6 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_7 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_8 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_9 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_10 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_11 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_12 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_13 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_14 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_15 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_16 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_17 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_18 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_19 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_20 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_21 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_22 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_23 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_24 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_25 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_26 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_27 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_28 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_29 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_30 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_31 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_32 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_33 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_34 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_35 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_36 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_37 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_38 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_39 ?? 0) + payRegistrations.Sum(x => x.SMonthType4_40 ?? 0); row70[b] = Funs.GetNewDecimalOrZero(row70[b].ToString()).ToString("N2"); @@ -2110,7 +2110,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row71[4] = "装置区域封闭用围挡"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row71[b] = payRegistrations.Sum(x => x.SMonthType5_1 ?? 0); row71[b] = Funs.GetNewDecimalOrZero(row71[b].ToString()).ToString("N2"); @@ -2139,7 +2139,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row72[4] = "防爆电箱、防爆插头插座、防爆灯具、防爆施工机具器具"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row72[b] = payRegistrations.Sum(x => x.SMonthType5_2 ?? 0); row72[b] = Funs.GetNewDecimalOrZero(row72[b].ToString()).ToString("N2"); @@ -2168,7 +2168,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row73[4] = "盲板管理用货架、专用锁具、专用标签与警示标志"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row73[b] = payRegistrations.Sum(x => x.SMonthType5_3 ?? 0); row73[b] = Funs.GetNewDecimalOrZero(row73[b].ToString()).ToString("N2"); @@ -2197,7 +2197,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row74[4] = "专区封闭管理措施费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row74[b] = payRegistrations.Sum(x => x.SMonthType5_4 ?? 0); row74[b] = Funs.GetNewDecimalOrZero(row74[b].ToString()).ToString("N2"); @@ -2226,7 +2226,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row75[4] = "防毒、放辐射措施和加氢点警戒、监护"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row75[b] = payRegistrations.Sum(x => x.SMonthType5_5 ?? 0); row75[b] = Funs.GetNewDecimalOrZero(row75[b].ToString()).ToString("N2"); @@ -2255,7 +2255,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row76[4] = "其他专项措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row76[b] = payRegistrations.Sum(x => x.SMonthType5_6 ?? 0); row76[b] = Funs.GetNewDecimalOrZero(row76[b].ToString()).ToString("N2"); @@ -2285,7 +2285,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row77[4] = "费用小计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row77[b] = payRegistrations.Sum(x => x.SMonthType5_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType5_6 ?? 0); row77[b] = Funs.GetNewDecimalOrZero(row77[b].ToString()).ToString("N2"); @@ -2316,7 +2316,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row78[4] = "安全教育培训工时占用费（入场教育、专项培训、违章停工教育）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row78[b] = payRegistrations.Sum(x => x.SMonthType6_1 ?? 0); row78[b] = Funs.GetNewDecimalOrZero(row78[b].ToString()).ToString("N2"); @@ -2345,7 +2345,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row79[4] = "师资费用"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row79[b] = payRegistrations.Sum(x => x.SMonthType6_2 ?? 0); row79[b] = Funs.GetNewDecimalOrZero(row79[b].ToString()).ToString("N2"); @@ -2374,7 +2374,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row80[4] = "安全培训教育器材、教材"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row80[b] = payRegistrations.Sum(x => x.SMonthType6_3 ?? 0); row80[b] = Funs.GetNewDecimalOrZero(row80[b].ToString()).ToString("N2"); @@ -2403,7 +2403,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row81[4] = "费用小计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row81[b] = payRegistrations.Sum(x => x.SMonthType6_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType6_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType6_3 ?? 0); row81[b] = Funs.GetNewDecimalOrZero(row81[b].ToString()).ToString("N2"); @@ -2434,7 +2434,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row82[4] = "减震与降低噪音设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row82[b] = payRegistrations.Sum(x => x.TMonthType1_1 ?? 0); row82[b] = Funs.GetNewDecimalOrZero(row82[b].ToString()).ToString("N2"); @@ -2463,7 +2463,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row83[4] = "射线防护的设施、措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row83[b] = payRegistrations.Sum(x => x.TMonthType1_2 ?? 0); row83[b] = Funs.GetNewDecimalOrZero(row83[b].ToString()).ToString("N2"); @@ -2492,7 +2492,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row84[4] = "声、光、尘、有害物质防逸散控制措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row84[b] = payRegistrations.Sum(x => x.TMonthType1_3 ?? 0); row84[b] = Funs.GetNewDecimalOrZero(row84[b].ToString()).ToString("N2"); @@ -2521,7 +2521,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row85[4] = "现场出入口和特定场所车辆、器材、人员清洗盥洗设施或设备"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row85[b] = payRegistrations.Sum(x => x.TMonthType1_4 ?? 0); row85[b] = Funs.GetNewDecimalOrZero(row85[b].ToString()).ToString("N2"); @@ -2550,7 +2550,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row86[4] = "土方覆盖遮挡与洒水及其他施工扬尘控制设施设备"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row86[b] = payRegistrations.Sum(x => x.TMonthType1_5 ?? 0); row86[b] = Funs.GetNewDecimalOrZero(row86[b].ToString()).ToString("N2"); @@ -2579,7 +2579,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row87[4] = "运输车辆及输送装置封闭或覆盖设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row87[b] = payRegistrations.Sum(x => x.TMonthType1_6 ?? 0); row87[b] = Funs.GetNewDecimalOrZero(row87[b].ToString()).ToString("N2"); @@ -2608,7 +2608,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row88[4] = "消纳施工污水的设施、措施（沟渠、槽池、管线、机泵及附属临建）"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row88[b] = payRegistrations.Sum(x => x.TMonthType1_7 ?? 0); row88[b] = Funs.GetNewDecimalOrZero(row88[b].ToString()).ToString("N2"); @@ -2637,7 +2637,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row89[4] = "易燃易爆、有毒有害、高腐蚀物质的使用保管、运输、回收过程中的安全防护设施和措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row89[b] = payRegistrations.Sum(x => x.TMonthType1_8 ?? 0); row89[b] = Funs.GetNewDecimalOrZero(row89[b].ToString()).ToString("N2"); @@ -2666,7 +2666,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row90[4] = "现场毒害物质使用、消纳及意外应急相关设施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row90[b] = payRegistrations.Sum(x => x.TMonthType1_9 ?? 0); row90[b] = Funs.GetNewDecimalOrZero(row90[b].ToString()).ToString("N2"); @@ -2695,7 +2695,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row91[4] = "危险物质特性说明书展示牌"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row91[b] = payRegistrations.Sum(x => x.TMonthType1_10 ?? 0); row91[b] = Funs.GetNewDecimalOrZero(row91[b].ToString()).ToString("N2"); @@ -2724,7 +2724,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row92[4] = "施工废弃物、生活垃圾分类存放和消纳的设施、措施"; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row92[b] = payRegistrations.Sum(x => x.TMonthType1_11 ?? 0); row92[b] = Funs.GetNewDecimalOrZero(row92[b].ToString()).ToString("N2"); @@ -2753,7 +2753,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row93[4] = "费用小计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row93[b] = payRegistrations.Sum(x => x.TMonthType1_1 ?? 0) + payRegistrations.Sum(x => x.TMonthType1_2 ?? 0) + payRegistrations.Sum(x => x.TMonthType1_3 ?? 0) + payRegistrations.Sum(x => x.TMonthType1_4 ?? 0) @@ -2794,7 +2794,7 @@ namespace FineUIPro.Web.HSSE.CostGoods row94[4] = "费用累计："; for (int i = 0; i < units.Count; i++) { - if (units[i].UnitId == BLL.Const.UnitId_TCC) //公司 + if (units[i].UnitId == BLL.Const.UnitId_XJYJ) //公司 { row94[b] = payRegistrations.Sum(x => x.SMonthType1_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_4 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_5 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_6 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_7 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_8 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_9 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_10 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_11 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_12 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_13 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_14 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_15 ?? 0) + payRegistrations.Sum(x => x.SMonthType1_16 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_1 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_2 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_3 ?? 0) + payRegistrations.Sum(x => x.SMonthType2_4 ?? 0) diff --git a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs index 5d6bf83..0ffcb8c 100644 --- a/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/EduTrain/TestRecordPrint.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.HSSE.EduTrain { if (!IsPostBack) { - this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); this.lbTestType.Text = "培训试题"; this.TestRecordId = Request.Params["TestRecordId"]; this.Type = Request.Params["Type"]; @@ -63,7 +63,7 @@ namespace FineUIPro.Web.HSSE.EduTrain { personInfo += "项目：" + ProjectService.GetProjectNameByProjectId(testRecord.ProjectId) + " "; } - else if (testRecord.UnitId == Const.UnitId_TCC) + else if (testRecord.UnitId == Const.UnitId_XJYJ) { personInfo += "部门：" + DepartService.getDepartNameById(testRecord.DepartId) + " "; } diff --git a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs index 1ff4a18..5fe4bdc 100644 --- a/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Hazard/ConstructionRisk.aspx.cs @@ -54,7 +54,7 @@ namespace FineUIPro.Web.HSSE.Hazard } } } - else if (user.UnitId == Const.UnitId_TCC || user.UserId == Const.hfnbdId) + else if (user.UnitId == Const.UnitId_XJYJ || user.UserId == Const.hfnbdId) { var ids = Funs.DB.HSSE_ConstructionRisk.Where(x => x.ProjectId == this.CurrUser.LoginProjectId).Select(x => x.UnitId).Distinct().ToList(); units = (from x in Funs.DB.Base_Unit diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs index fc21ced..239ff25 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/AccidentCauseReportEdit.aspx.cs @@ -337,7 +337,7 @@ namespace FineUIPro.Web.HSSE.InformationProject Model.InformationProject_AccidentCauseReport accidentCauseReport = new Model.InformationProject_AccidentCauseReport { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, AccidentCauseReportCode = txtAccidentCauseReportCode.Text.Trim() }; if (this.drpYear.SelectedValue != BLL.Const._Null) diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReportEdit.aspx.cs index cdd60a2..f4ae762 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillConductedQuarterlyReportEdit.aspx.cs @@ -318,7 +318,7 @@ namespace FineUIPro.Web.HSSE.InformationProject Model.InformationProject_DrillConductedQuarterlyReport drillConductedQuarterlyReport = new Model.InformationProject_DrillConductedQuarterlyReport { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, }; if (this.ddlYearId.SelectedValue != BLL.Const._Null) diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReportEdit.aspx.cs index 5d2bcb6..17de977 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/DrillPlanHalfYearReportEdit.aspx.cs @@ -280,7 +280,7 @@ namespace FineUIPro.Web.HSSE.InformationProject Model.InformationProject_DrillPlanHalfYearReport drillPlanHalfYearReport = new Model.InformationProject_DrillPlanHalfYearReport { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, }; if (this.ddlYearId.SelectedValue != BLL.Const._Null) diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs index 0652923..adaf323 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs @@ -499,7 +499,7 @@ namespace FineUIPro.Web.InformationProject if (unit != null) { int count = BLL.SitePerson_DayReportService.GetDayReportsByCompileDateAndUnitId(startTime, endTime, this.CurrUser.LoginProjectId, unitId).Count(); - if (unit.UnitId == Const.UnitId_TCC) //本单位 + if (unit.UnitId == Const.UnitId_XJYJ) //本单位 { //本单位在岗员工 decimal personNum = (from x in dayReports @@ -594,7 +594,7 @@ namespace FineUIPro.Web.InformationProject Model.Base_Unit unit = BLL.UnitService.GetUnitByUnitId(unitId); if (unit != null) { - if (unit.UnitId == Const.UnitId_TCC) //本单位 + if (unit.UnitId == Const.UnitId_XJYJ) //本单位 { //本单位在岗员工 decimal? personNum = db.SitePerson_MonthReportDetail.Where(x => x.MonthReportId == monthReport.MonthReportId && x.UnitId == unitId).Sum(x => x.RealPersonNum); diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs index 6ea7225..ca20f83 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/SafetyQuarterlyReportEdit.aspx.cs @@ -389,7 +389,7 @@ namespace FineUIPro.Web.HSSE.InformationProject Model.InformationProject_SafetyQuarterlyReport safetyQuarterlyReport = new Model.InformationProject_SafetyQuarterlyReport { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, }; if (this.ddlYearId.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReportEdit.aspx.cs index 88efce1..87842ce 100644 --- a/SGGL/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReportEdit.aspx.cs @@ -144,7 +144,7 @@ namespace FineUIPro.Web.HSSE.InformationProject Model.InformationProject_WorkSummaryReport report = new Model.InformationProject_WorkSummaryReport { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, }; if (this.ddlYearId.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/HSSE/Law/HSSEStandardListSave.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Law/HSSEStandardListSave.aspx.cs index 3ca4b67..6fda396 100644 --- a/SGGL/FineUIPro.Web/HSSE/Law/HSSEStandardListSave.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Law/HSSEStandardListSave.aspx.cs @@ -170,7 +170,7 @@ namespace FineUIPro.Web.HSSE.Law { hSSEStandardsList.IsPass = true; hSSEStandardsList.CompileMan = this.CurrUser.UserName; - hSSEStandardsList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + hSSEStandardsList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; hSSEStandardsList.CompileDate = System.DateTime.Now; this.StandardId = SQLHelper.GetNewID(typeof(Model.Law_HSSEStandardsList)); hSSEStandardsList.StandardId = this.StandardId; diff --git a/SGGL/FineUIPro.Web/HSSE/Law/LawRegulationListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Law/LawRegulationListEdit.aspx.cs index 97eacd1..141f72c 100644 --- a/SGGL/FineUIPro.Web/HSSE/Law/LawRegulationListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Law/LawRegulationListEdit.aspx.cs @@ -129,7 +129,7 @@ namespace FineUIPro.Web.HSSE.Law lawRegulationList.IsPass = true; lawRegulationList.CompileMan = this.CurrUser.UserName; lawRegulationList.CompileDate = System.DateTime.Now; - lawRegulationList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + lawRegulationList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; this.LawRegulationId = SQLHelper.GetNewID(typeof(Model.Law_LawRegulationList)); lawRegulationList.LawRegulationId = this.LawRegulationId; BLL.LawRegulationListService.AddLawRegulationList(lawRegulationList); diff --git a/SGGL/FineUIPro.Web/HSSE/Law/ManageRuleEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Law/ManageRuleEdit.aspx.cs index df8e14d..b9353f5 100644 --- a/SGGL/FineUIPro.Web/HSSE/Law/ManageRuleEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Law/ManageRuleEdit.aspx.cs @@ -132,7 +132,7 @@ namespace FineUIPro.Web.Law manageRule.VersionNo = this.txtVersionNo.Text.Trim(); manageRule.AttachUrl = this.FullAttachUrl; manageRule.Remark = this.txtRemark.Text.Trim(); - manageRule.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + manageRule.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; manageRule.SeeFile = HttpUtility.HtmlEncode(this.txtSeeFile.Text); if (string.IsNullOrEmpty(this.ManageRuleId)) { diff --git a/SGGL/FineUIPro.Web/HSSE/Law/RulesRegulationsEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Law/RulesRegulationsEdit.aspx.cs index 69e8903..f0586d6 100644 --- a/SGGL/FineUIPro.Web/HSSE/Law/RulesRegulationsEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Law/RulesRegulationsEdit.aspx.cs @@ -119,7 +119,7 @@ namespace FineUIPro.Web.HSSE.Law rulesRegulations.IsPass = true; rulesRegulations.CompileMan = this.CurrUser.UserName; rulesRegulations.CompileDate = System.DateTime.Now; - rulesRegulations.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + rulesRegulations.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; this.RulesRegulationsId = SQLHelper.GetNewID(); rulesRegulations.RulesRegulationsId = this.RulesRegulationsId; BLL.RulesRegulationsService.AddRulesRegulations(rulesRegulations); diff --git a/SGGL/FineUIPro.Web/HSSE/License/ApplyView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/ApplyView.aspx.cs index e259b48..3208b37 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/ApplyView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/ApplyView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.LicenseApplyId = Request.Params["LicenseApplyId"]; if (!string.IsNullOrEmpty(this.LicenseApplyId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs index a5edd8b..c316b8e 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.BreakGroundId = Request.Params["BreakGroundId"]; if (!string.IsNullOrEmpty(this.BreakGroundId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs index ece9976..63660ea 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.FireWorkId = Request.Params["FireWorkId"]; if (!string.IsNullOrEmpty(this.FireWorkId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs index ad14c34..345e03b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HSETechnicalEdit.aspx.cs @@ -109,7 +109,7 @@ namespace FineUIPro.Web.HSSE.License UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true); //var pUnit = BLL.ProjectUnitService.GetProjectUnitByUnitIdProjectId(this.CurrUser.LoginProjectId, this.CurrUser.UnitId); - if (this.CurrUser.UnitId != Const.UnitId_TCC) + if (this.CurrUser.UnitId != Const.UnitId_XJYJ) { this.drpUnitId.Enabled = false; } diff --git a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs index 5b8824d..5814adf 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/HeightWorkView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.HeightWorkId = Request.Params["HeightWorkId"]; if (!string.IsNullOrEmpty(this.HeightWorkId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/JiaBanView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/JiaBanView.aspx.cs index 0f1f194..51a8a72 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/JiaBanView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/JiaBanView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.JiaBanId = Request.Params["JiaBanId"]; if (!string.IsNullOrEmpty(this.JiaBanId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs index bc375f6..245a5de 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.LiftingWorkId = Request.Params["LiftingWorkId"]; if (!string.IsNullOrEmpty(this.LiftingWorkId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs index cb9b108..e12175d 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LimitedSpaceView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.LimitedSpaceId = Request.Params["LimitedSpaceId"]; if (!string.IsNullOrEmpty(this.LimitedSpaceId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs index fc6b37a..1cb3471 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/NightWorkView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.NightWorkId = Request.Params["NightWorkId"]; if (!string.IsNullOrEmpty(this.NightWorkId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs index 4e476b4..2282fea 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/OpenCircuitView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.OpenCircuitId = Request.Params["OpenCircuitId"]; if (!string.IsNullOrEmpty(this.OpenCircuitId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/PressureTestView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/PressureTestView.aspx.cs index 936a6b9..1da401e 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/PressureTestView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/PressureTestView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.PressureTestId = Request.Params["PressureTestId"]; if (!string.IsNullOrEmpty(this.PressureTestId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs index c7411d6..06b64c2 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/RadialWorkView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.RadialWorkId = Request.Params["RadialWorkId"]; if (!string.IsNullOrEmpty(this.RadialWorkId)) diff --git a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs index 4ead20c..624b815 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs @@ -36,7 +36,7 @@ { if (!IsPostBack) { - this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + this.Title; + this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + this.Title; this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.TempElectricityId = Request.Params["TempElectricityId"]; if (!string.IsNullOrEmpty(this.TempElectricityId)) diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthEdit.aspx.cs index 84ed350..dffabe0 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthEdit.aspx.cs @@ -48,7 +48,7 @@ namespace FineUIPro.Web.HSSE.Manager { if (!IsPostBack) { - var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); if (unit != null && !string.IsNullOrEmpty(unit.UnitCode)) { string url = "../Images/SUBimages/" + unit.UnitCode + ".gif"; diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs index a14a0ad..18cab19 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/HSSELogMonthView.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.HSSE.Manager { if (!IsPostBack) { - var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); if (unit != null && !string.IsNullOrEmpty(unit.UnitCode)) { string url = "../Images/SUBimages/" + unit.UnitCode + ".gif"; diff --git a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs index 8b2dc6c..d3efc36 100644 --- a/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Manager/ManagerMonth_SeDinEdit.aspx.cs @@ -79,10 +79,10 @@ namespace FineUIPro.Web.HSSE.Manager { MonthReportId = Request.Params["MonthReportId"]; } - BLL.UserService.InitFlowOperateControlUserDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, false); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.CompileManId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, false); this.CompileManId.SelectedValue = this.CurrUser.UserId; - BLL.UserService.InitFlowOperateControlUserDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, false); - BLL.UserService.InitFlowOperateControlUserDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, Const.UnitId_TCC, false); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.AuditManId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, false); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.ApprovalManId, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, false); string montvalues = ReporMonth.Text; var getMont = Funs.DB.SeDin_MonthReport.FirstOrDefault(x => x.MonthReportId == this.MonthReportId); if (getMont != null) @@ -130,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Manager this.drpStep.DataSource = BLL.DropListService.GetMonthReportStepList(this.States); this.drpStep.DataBind(); - UserService.InitUserProjectIdUnitIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + UserService.InitUserProjectIdUnitIdDropDownList(this.drpAudit, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); if (this.States == Const.State_0 || string.IsNullOrEmpty(this.States)) ///待提交 { this.txtOpinion.Hidden = true; diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQualityEdit.aspx.cs index 92733ea..9970b30 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQualityEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/EquipmentPersonQualityEdit.aspx.cs @@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit var EquipmentPersonQuality = BLL.EquipmentPersonQualityService.GetEquipmentPersonQualityByPersonId(this.PersonId); if (EquipmentPersonQuality != null) { - UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true); + UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true); this.EquipmentPersonQualityId = EquipmentPersonQuality.EquipmentPersonQualityId; this.txtCertificateNo.Text = EquipmentPersonQuality.CertificateNo; this.drpCertificate.SelectedValue = EquipmentPersonQuality.CertificateId; @@ -110,7 +110,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true); + UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true); } if (Request.Params["value"] == "0") diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs index 59fc961..75db860 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/PersonQualityEdit.aspx.cs @@ -89,7 +89,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit var personQuality = BLL.PersonQualityService.GetPersonQualityByPersonId(this.PersonId); if (personQuality != null) { - UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true); + UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true); this.PersonQualityId = personQuality.PersonQualityId; this.txtCertificateNo.Text = personQuality.CertificateNo; this.drpCertificate.SelectedValue = personQuality.CertificateId; @@ -110,7 +110,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit { this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true); + UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true); } if (Request.Params["value"] == "0") diff --git a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs index 061dfeb..467589e 100644 --- a/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/QualityAudit/SafePersonQualityEdit.aspx.cs @@ -87,7 +87,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit var SafePersonQuality = BLL.SafePersonQualityService.GetSafePersonQualityByPersonId(this.PersonId); if (SafePersonQuality != null) { - UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true); + UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true); this.SafePersonQualityId = SafePersonQuality.SafePersonQualityId; this.txtCertificateNo.Text = SafePersonQuality.CertificateNo; this.txtCertificateName.Text = SafePersonQuality.CertificateName; @@ -106,7 +106,7 @@ namespace FineUIPro.Web.HSSE.QualityAudit } else { - UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true); + UserService.InitUserProjectIdUnitIdDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true); this.txtSendDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); } diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx index 65bb651..00978fa 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx @@ -106,8 +106,20 @@ FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="入场时间" HeaderTextAlign="Center" TextAlign="Center"> - + + + + + + + + + @@ -182,6 +194,9 @@ + + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs index d5fbacc..89826aa 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonIn.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using FineUIPro.Web.SysManage; using System; using System.Collections.Generic; using System.Data; @@ -155,7 +156,7 @@ namespace FineUIPro.Web.HSSE.SitePerson oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL(ds.Tables[0], 38); + AddDatasetToSQL(ds.Tables[0], 43); } catch (Exception ex) { @@ -201,6 +202,10 @@ namespace FineUIPro.Web.HSSE.SitePerson select x; var positions = from x in Funs.DB.Base_Position select x; var postTitles = from x in Funs.DB.Base_PostTitle select x; + var institutionalDivisions = from x in Funs.DB.Base_InstitutionalDivision select x; + var departs = from x in Funs.DB.Base_Depart select x; + var employeeCategorys = from x in Funs.DB.Base_EmployeeCategory select x; + var employeeSubgroups = from x in Funs.DB.Base_EmployeeSubgroup select x; for (int i = 0; i < ir; i++) { string col1 = pds.Rows[i][1].ToString().Trim(); @@ -394,97 +399,137 @@ namespace FineUIPro.Web.HSSE.SitePerson string col14 = pds.Rows[i][14].ToString().Trim(); if (!string.IsNullOrEmpty(col14)) { - var position = positions.FirstOrDefault(e => e.PositionName == col14); - if (position == null) + var institutionalDivision = institutionalDivisions.FirstOrDefault(e => e.Name == col14); + if (institutionalDivision == null) { - result += "第" + (i + 2).ToString() + "行," + "所属职务" + "," + "[" + col14 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "机构划分" + "," + "[" + col14 + "]错误！" + "|"; } } string col15 = pds.Rows[i][15].ToString().Trim(); if (!string.IsNullOrEmpty(col15)) { - var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col15); - if (postTitle == null) + var depart = departs.FirstOrDefault(e => e.DepartName == col15); + if (depart == null) { - result += "第" + (i + 2).ToString() + "行," + "所属职称" + "," + "[" + col15 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "组织单元" + "," + "[" + col15 + "]错误！" + "|"; } } string col16 = pds.Rows[i][16].ToString().Trim(); if (!string.IsNullOrEmpty(col16)) { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col16); - if (basicData == null) + var employeeCategory = employeeCategorys.FirstOrDefault(e => e.CategoryName == col16); + if (employeeCategory == null) { - result += "第" + (i + 2).ToString() + "行," + "文化程度" + "," + "[" + col16 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "人员分类" + "," + "[" + col16 + "]错误！" + "|"; } } string col17 = pds.Rows[i][17].ToString().Trim(); if (!string.IsNullOrEmpty(col17)) { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col17); - if (basicData == null) + var employeeSubgroup = employeeSubgroups.FirstOrDefault(e => e.SubgroupName == col17); + if (employeeSubgroup == null) { - result += "第" + (i + 2).ToString() + "行," + "婚姻状况" + "," + "[" + col17 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "员工子组" + "," + "[" + col17 + "]错误！" + "|"; } } string col18 = pds.Rows[i][18].ToString().Trim(); if (!string.IsNullOrEmpty(col18)) { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col18); - if (basicData == null) + var position = positions.FirstOrDefault(e => e.PositionName == col18); + if (position == null) { - result += "第" + (i + 2).ToString() + "行," + "政治面貌" + "," + "[" + col18 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "所属职务" + "," + "[" + col18 + "]错误！" + "|"; } } string col19 = pds.Rows[i][19].ToString().Trim(); if (!string.IsNullOrEmpty(col19)) { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col19); - if (basicData == null) + var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col19); + if (postTitle == null) { - result += "第" + (i + 2).ToString() + "行," + "民族" + "," + "[" + col19 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "所属职称" + "," + "[" + col19 + "]错误！" + "|"; } } string col20 = pds.Rows[i][20].ToString().Trim(); if (!string.IsNullOrEmpty(col20)) { - var country = countrys.FirstOrDefault(e => e.Cname == col20); - if (country == null) + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col20); + if (basicData == null) { - result += "第" + (i + 2).ToString() + "行," + "国家" + "," + "[" + col20 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "文化程度" + "," + "[" + col20 + "]错误！" + "|"; } } string col21 = pds.Rows[i][21].ToString().Trim(); if (!string.IsNullOrEmpty(col21)) { - var city = citys.FirstOrDefault(e => e.Cname == col21); - if (city == null) + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col21); + if (basicData == null) { - result += "第" + (i + 2).ToString() + "行," + "省或地区" + "," + "[" + col21 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "婚姻状况" + "," + "[" + col21 + "]错误！" + "|"; } } string col22 = pds.Rows[i][22].ToString().Trim(); if (!string.IsNullOrEmpty(col22)) { - var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col22); - if (cnProfessional == null) + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col22); + if (basicData == null) { - result += "第" + (i + 2).ToString() + "行," + "主专业" + "," + "[" + col22 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "政治面貌" + "," + "[" + col22 + "]错误！" + "|"; } } string col23 = pds.Rows[i][23].ToString().Trim(); if (!string.IsNullOrEmpty(col23)) { - string[] strs = col23.Split('，'); + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col23); + if (basicData == null) + { + result += "第" + (i + 2).ToString() + "行," + "民族" + "," + "[" + col23 + "]错误！" + "|"; + } + } + + string col24 = pds.Rows[i][24].ToString().Trim(); + if (!string.IsNullOrEmpty(col24)) + { + var country = countrys.FirstOrDefault(e => e.Cname == col24); + if (country == null) + { + result += "第" + (i + 2).ToString() + "行," + "国家" + "," + "[" + col24 + "]错误！" + "|"; + } + } + + string col25 = pds.Rows[i][25].ToString().Trim(); + if (!string.IsNullOrEmpty(col25)) + { + var city = citys.FirstOrDefault(e => e.Cname == col25); + if (city == null) + { + result += "第" + (i + 2).ToString() + "行," + "省或地区" + "," + "[" + col25 + "]错误！" + "|"; + } + } + + string col26 = pds.Rows[i][26].ToString().Trim(); + if (!string.IsNullOrEmpty(col26)) + { + var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col26); + if (cnProfessional == null) + { + result += "第" + (i + 2).ToString() + "行," + "主专业" + "," + "[" + col26 + "]错误！" + "|"; + } + } + + string col27 = pds.Rows[i][27].ToString().Trim(); + if (!string.IsNullOrEmpty(col27)) + { + string[] strs = col27.Split('，'); foreach (var item in strs) { var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == item); @@ -495,54 +540,28 @@ namespace FineUIPro.Web.HSSE.SitePerson } } - string col24 = pds.Rows[i][24].ToString().Trim(); - if (!string.IsNullOrEmpty(col24)) - { - var certificate = certificates.FirstOrDefault(e => e.CertificateName == col24); - if (certificate == null) - { - result += "第" + (i + 2).ToString() + "行," + "特岗证书" + "," + "[" + col24 + "]错误！" + "|"; - } - } - - string col27 = pds.Rows[i][27].ToString().Trim(); - if (!string.IsNullOrEmpty(col27)) - { - try - { - DateTime date = Convert.ToDateTime(col27); - } - catch (Exception) - { - result += "第" + (i + 2).ToString() + "行," + "发证日期" + "," + "[" + col27 + "]错误！" + "|"; - } - } string col28 = pds.Rows[i][28].ToString().Trim(); if (!string.IsNullOrEmpty(col28)) { - try + var certificate = certificates.FirstOrDefault(e => e.CertificateName == col28); + if (certificate == null) { - DateTime date = Convert.ToDateTime(col28); - } - catch (Exception) - { - result += "第" + (i + 2).ToString() + "行," + "证书有效期" + "," + "[" + col28 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "特岗证书" + "," + "[" + col28 + "]错误！" + "|"; } } - string col29 = pds.Rows[i][29].ToString().Trim(); - if (!string.IsNullOrEmpty(col29)) + string col31 = pds.Rows[i][31].ToString().Trim(); + if (!string.IsNullOrEmpty(col31)) { try { - DateTime date = Convert.ToDateTime(col29); + DateTime date = Convert.ToDateTime(col31); } catch (Exception) { - result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col29 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "发证日期" + "," + "[" + col31 + "]错误！" + "|"; } } - string col32 = pds.Rows[i][32].ToString().Trim(); if (!string.IsNullOrEmpty(col32)) { @@ -552,34 +571,60 @@ namespace FineUIPro.Web.HSSE.SitePerson } catch (Exception) { - result += "第" + (i + 2).ToString() + "行," + "出场时间" + "," + "[" + col32 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "证书有效期" + "," + "[" + col32 + "]错误！" + "|"; } } - string col34 = pds.Rows[i][34].ToString().Trim(); - if (!string.IsNullOrEmpty(col34)) + string col33 = pds.Rows[i][33].ToString().Trim(); + if (!string.IsNullOrEmpty(col33)) { - if (col34 != "是" && col34 != "否") + try { - result += "第" + (i + 2).ToString() + "行," + "外籍" + "," + "[" + col34 + "]错误！" + "|"; + DateTime date = Convert.ToDateTime(col33); } - } - - string col35 = pds.Rows[i][35].ToString().Trim(); - if (!string.IsNullOrEmpty(col35)) - { - if (col35 != "是" && col35 != "否") + catch (Exception) { - result += "第" + (i + 2).ToString() + "行," + "外聘" + "," + "[" + col35 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "出生日期" + "," + "[" + col33 + "]错误！" + "|"; } } string col36 = pds.Rows[i][36].ToString().Trim(); if (!string.IsNullOrEmpty(col36)) { - if (col36 != "是" && col36 != "否") + try { - result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "[" + col36 + "]错误！" + "|"; + DateTime date = Convert.ToDateTime(col36); + } + catch (Exception) + { + result += "第" + (i + 2).ToString() + "行," + "出场时间" + "," + "[" + col36 + "]错误！" + "|"; + } + } + + string col38 = pds.Rows[i][38].ToString().Trim(); + if (!string.IsNullOrEmpty(col38)) + { + if (col38 != "是" && col38 != "否") + { + result += "第" + (i + 2).ToString() + "行," + "外籍" + "," + "[" + col38 + "]错误！" + "|"; + } + } + + string col39 = pds.Rows[i][39].ToString().Trim(); + if (!string.IsNullOrEmpty(col39)) + { + if (col39 != "是" && col39 != "否") + { + result += "第" + (i + 2).ToString() + "行," + "外聘" + "," + "[" + col39 + "]错误！" + "|"; + } + } + + string col40 = pds.Rows[i][40].ToString().Trim(); + if (!string.IsNullOrEmpty(col40)) + { + if (col40 != "是" && col40 != "否") + { + result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "[" + col40 + "]错误！" + "|"; } } else @@ -587,12 +632,12 @@ namespace FineUIPro.Web.HSSE.SitePerson result += "第" + (i + 2).ToString() + "行," + "人员是否在场" + "," + "此项为必填项！" + "|"; } - string col37 = pds.Rows[i][37].ToString().Trim(); - if (!string.IsNullOrEmpty(col37)) + string col41 = pds.Rows[i][41].ToString().Trim(); + if (!string.IsNullOrEmpty(col41)) { - if (col37 != "是" && col37 != "否") + if (col41 != "是" && col41 != "否") { - result += "第" + (i + 2).ToString() + "行," + "考勤卡是否启用" + "," + "[" + col37 + "]错误！" + "|"; + result += "第" + (i + 2).ToString() + "行," + "考勤卡是否启用" + "," + "[" + col41 + "]错误！" + "|"; } } //else @@ -694,7 +739,7 @@ namespace FineUIPro.Web.HSSE.SitePerson oleDBConn.Close(); oleDBConn.Dispose(); - AddDatasetToSQL2(ds.Tables[0], 38); + AddDatasetToSQL2(ds.Tables[0], 43); } catch (Exception ex) { @@ -741,6 +786,10 @@ namespace FineUIPro.Web.HSSE.SitePerson select x; var positions = from x in Funs.DB.Base_Position select x; var postTitles = from x in Funs.DB.Base_PostTitle select x; + var institutionalDivisions = from x in Funs.DB.Base_InstitutionalDivision select x; + var departs = from x in Funs.DB.Base_Depart select x; + var employeeCategorys = from x in Funs.DB.Base_EmployeeCategory select x; + var employeeSubgroups = from x in Funs.DB.Base_EmployeeSubgroup select x; for (int i = 0; i < ir; i++) { string col1 = pds.Rows[i][1].ToString().Trim(); @@ -786,6 +835,11 @@ namespace FineUIPro.Web.HSSE.SitePerson string col35 = pds.Rows[i][35].ToString().Trim(); string col36 = pds.Rows[i][36].ToString().Trim(); string col37 = pds.Rows[i][37].ToString().Trim(); + string col38 = pds.Rows[i][38].ToString().Trim(); + string col39 = pds.Rows[i][39].ToString().Trim(); + string col40 = pds.Rows[i][40].ToString().Trim(); + string col41 = pds.Rows[i][41].ToString().Trim(); + string col42 = pds.Rows[i][42].ToString().Trim(); if (!string.IsNullOrEmpty(col0))//卡号 { @@ -878,92 +932,129 @@ namespace FineUIPro.Web.HSSE.SitePerson { person.InTime = Funs.GetNewDateTime(col13); } - if (!string.IsNullOrEmpty(col14))//所属职务 + + if (!string.IsNullOrEmpty(col14))//机构划分 { - var position = positions.FirstOrDefault(e => e.PositionName == col14); + var institutionalDivision = institutionalDivisions.FirstOrDefault(e => e.Name == col14); + if (institutionalDivision != null) + { + person.InstitutionalDivisionId = institutionalDivision.Id; + person.InstitutionalDivisionName = institutionalDivision.Name; + } + } + if (!string.IsNullOrEmpty(col15))//组织单元 + { + var depart = departs.FirstOrDefault(e => e.DepartName == col15); + if (depart != null) + { + person.DepartId = depart.DepartId; + person.DepartName = depart.DepartName; + } + } + if (!string.IsNullOrEmpty(col16))//人员分类 + { + var employeeCategory = employeeCategorys.FirstOrDefault(e => e.CategoryName == col16); + if (employeeCategory != null) + { + person.EmployeeCategoryId = employeeCategory.CategoryId; + person.EmployeeCategoryName = employeeCategory.CategoryName; + } + } + if (!string.IsNullOrEmpty(col17))//员工子组 + { + var employeeSubgroup = employeeSubgroups.FirstOrDefault(e => e.SubgroupName == col17); + if (employeeSubgroup != null) + { + person.EmployeeSubgroupId = employeeSubgroup.SubgroupId; + person.EmployeeSubgroupName = employeeSubgroup.SubgroupName; + } + } + if (!string.IsNullOrEmpty(col18))//所属职务 + { + var position = positions.FirstOrDefault(e => e.PositionName == col18); if (position != null) { person.PositionId = position.PositionId; person.PositionName = position.PositionName; } } - if (!string.IsNullOrEmpty(col15))//所属职称 + if (!string.IsNullOrEmpty(col19))//所属职称 { - var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col15); + var postTitle = postTitles.FirstOrDefault(e => e.PostTitleName == col19); if (postTitle != null) { person.PostTitleId = postTitle.PostTitleId; person.PostTitleName = postTitle.PostTitleName; } } - if (!string.IsNullOrEmpty(col16))//文化程度 + if (!string.IsNullOrEmpty(col20))//文化程度 { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col16); + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col20); if (basicData != null) { person.EduLevel = basicData.DictCode; person.EduLevelName = basicData.DictName; } } - if (!string.IsNullOrEmpty(col17))//婚姻状况 + if (!string.IsNullOrEmpty(col21))//婚姻状况 { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col17); + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col21); if (basicData != null) { person.MaritalStatus = basicData.DictCode; person.MaritalStatusName = basicData.DictName; } } - if (!string.IsNullOrEmpty(col18))//政治面貌 + if (!string.IsNullOrEmpty(col22))//政治面貌 { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col18); + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col22); if (basicData != null) { person.PoliticsStatus = basicData.DictCode; person.PoliticsStatusName = basicData.DictName; } } - if (!string.IsNullOrEmpty(col19))//民族 + if (!string.IsNullOrEmpty(col23))//民族 { - var basicData = basicDatas.FirstOrDefault(e => e.DictName == col19); + var basicData = basicDatas.FirstOrDefault(e => e.DictName == col23); if (basicData != null) { person.Nation = basicData.DictCode; person.NationName = basicData.DictName; } } - if (!string.IsNullOrEmpty(col20))//国家 + if (!string.IsNullOrEmpty(col24))//国家 { - var country = countrys.FirstOrDefault(e => e.Cname == col20); + var country = countrys.FirstOrDefault(e => e.Cname == col24); if (country != null) { person.CountryCode = country.CountryId; person.CountryName = country.Cname; } } - if (!string.IsNullOrEmpty(col21))//省或地区 + if (!string.IsNullOrEmpty(col25))//省或地区 { - var city = citys.FirstOrDefault(e => e.Cname == col21); + var city = citys.FirstOrDefault(e => e.Cname == col25); if (city != null) { person.ProvinceCode = city.ProvinceCode; person.ProvinceName = city.Cname; } } - if (!string.IsNullOrEmpty(col22))//主专业 + if (!string.IsNullOrEmpty(col26))//主专业 { - var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col22); + var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == col26); if (cnProfessional != null) { person.MainCNProfessionalId = cnProfessional.CNProfessionalId; person.MainCNProfessionalName = cnProfessional.ProfessionalName; } } - if (!string.IsNullOrEmpty(col23))//副专业 + if (!string.IsNullOrEmpty(col27))//副专业 { - person.ViceCNProfessionalName = col23; + person.ViceCNProfessionalName = col27; string ids = string.Empty; - string[] strs = col23.Split('，'); + string[] strs = col27.Split('，'); foreach (var item in strs) { var cnProfessional = cnProfessionals.FirstOrDefault(e => e.ProfessionalName == item); @@ -978,63 +1069,67 @@ namespace FineUIPro.Web.HSSE.SitePerson } person.ViceCNProfessionalId = ids; } - if (!string.IsNullOrEmpty(col24))//特岗证书 + if (!string.IsNullOrEmpty(col28))//特岗证书 { - personQuality.CertificateName = col24; + personQuality.CertificateName = col28; } - if (!string.IsNullOrEmpty(col25))//证书编号 + if (!string.IsNullOrEmpty(col29))//证书编号 { - personQuality.CertificateNo = col25; + personQuality.CertificateNo = col29; } - if (!string.IsNullOrEmpty(col26))//发证单位 + if (!string.IsNullOrEmpty(col30))//发证单位 { - personQuality.SendUnit = col26; + personQuality.SendUnit = col30; } - if (!string.IsNullOrEmpty(col27))//发证日期 + if (!string.IsNullOrEmpty(col31))//发证日期 { - personQuality.SendDate = Funs.GetNewDateTime(col27); + personQuality.SendDate = Funs.GetNewDateTime(col31); } - if (!string.IsNullOrEmpty(col28))//证书有效期 + if (!string.IsNullOrEmpty(col32))//证书有效期 { - personQuality.LimitDate = Funs.GetNewDateTime(col28); + personQuality.LimitDate = Funs.GetNewDateTime(col32); } - if (!string.IsNullOrEmpty(col29))//出生日期 + if (!string.IsNullOrEmpty(col33))//出生日期 { - person.Birthday = Funs.GetNewDateTime(col29); + person.Birthday = Funs.GetNewDateTime(col33); } - if (!string.IsNullOrEmpty(col30))//电话 + if (!string.IsNullOrEmpty(col34))//电话 { - person.Telephone = col30; + person.Telephone = col34; } - if (!string.IsNullOrEmpty(col31))//家庭地址 + if (!string.IsNullOrEmpty(col35))//家庭地址 { - person.Address = col31; + person.Address = col35; } - if (!string.IsNullOrEmpty(col32))//出场时间 + if (!string.IsNullOrEmpty(col36))//出场时间 { - person.OutTime = Funs.GetNewDateTime(col32); + person.OutTime = Funs.GetNewDateTime(col36); } - if (!string.IsNullOrEmpty(col33))//出场原因 + if (!string.IsNullOrEmpty(col37))//出场原因 { - person.OutResult = col33; + person.OutResult = col37; } - if (!string.IsNullOrEmpty(col34))//外籍 + if (!string.IsNullOrEmpty(col38))//外籍 { - person.IsForeignStr = col34; - person.IsForeign = col34 == "是" ? true : false; + person.IsForeignStr = col38; + person.IsForeign = col38 == "是" ? true : false; } - if (!string.IsNullOrEmpty(col35))//外聘 + if (!string.IsNullOrEmpty(col39))//外聘 { - person.IsOutsideStr = col35; - person.IsOutside = col35 == "是" ? true : false; + person.IsOutsideStr = col39; + person.IsOutside = col39 == "是" ? true : false; } - if (!string.IsNullOrEmpty(col36))//人员是否在场 + if (!string.IsNullOrEmpty(col40))//人员是否在场 { - person.IsUsedName = col36; + person.IsUsedName = col40; } - if (!string.IsNullOrEmpty(col37))//考勤卡是否启用 + if (!string.IsNullOrEmpty(col41))//考勤卡是否启用 { - person.IsCardUsedName = col37; + person.IsCardUsedName = col41; + } + if (!string.IsNullOrEmpty(col42))//备注 + { + person.Remarks = col42; } person.PersonId = SQLHelper.GetNewID(typeof(Model.SitePerson_Person)); persons.Add(person); @@ -1095,9 +1190,17 @@ namespace FineUIPro.Web.HSSE.SitePerson newPerson.WorkPostId = persons[i].WorkPostId; newPerson.TeamGroupId = persons[i].TeamGroupId; newPerson.WorkAreaId = persons[i].WorkAreaId; - newPerson.InTime = persons[i].InTime; + newPerson.InTime = persons[i].InTime; newPerson.PositionId = persons[i].PositionId; newPerson.PostTitleId = persons[i].PostTitleId; + newPerson.DepartId = persons[i].DepartId; + newPerson.EmployeeCategoryId = persons[i].EmployeeCategoryId; + newPerson.EmployeeSubgroupId = persons[i].EmployeeSubgroupId; + newPerson.InstitutionalDivisionId = persons[i].InstitutionalDivisionId; + newPerson.DepartName = persons[i].DepartName; + newPerson.EmployeeCategoryName = persons[i].EmployeeCategoryName; + newPerson.EmployeeSubgroupName = persons[i].EmployeeSubgroupName; + newPerson.InstitutionalDivisionName = persons[i].InstitutionalDivisionName; newPerson.EduLevel = persons[i].EduLevel; newPerson.MaritalStatus = persons[i].MaritalStatus; newPerson.PoliticsStatus = persons[i].PoliticsStatus; diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx index 141471b..02de8df 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx @@ -1,7 +1,6 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PersonListEdit.aspx.cs" Inherits="FineUIPro.Web.HSSE.SitePerson.PersonListEdit" %> - 编辑人员信息 @@ -74,15 +73,15 @@ - + - + <%----%> - + + + + - - - @@ -122,22 +122,22 @@ - - + + - + - - + + + + - - - @@ -146,7 +146,6 @@ <%-- --%> - - + - + - + - + - + - + @@ -197,13 +196,13 @@ - + - + @@ -211,9 +210,9 @@ - + - @@ -222,11 +221,25 @@ - - - + + + - + + + + + + + + + + + + + + + @@ -234,6 +247,11 @@ + + + + + diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs index 12877f6..2a26a59 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs @@ -137,6 +137,22 @@ namespace FineUIPro.Web.HSSE.SitePerson { this.drpMainCNProfessional.SelectedValue = person.MainCNProfessionalId; } + if (!string.IsNullOrEmpty(person.InstitutionalDivisionId)) + { + this.drpInstitutionalDivision.SelectedValue = person.InstitutionalDivisionId; + } + if (!string.IsNullOrEmpty(person.DepartId)) + { + this.drpDepart.SelectedValue = person.DepartId; + } + if (!string.IsNullOrEmpty(person.EmployeeCategoryId)) + { + this.drpEmployeeCategory.SelectedValue = person.EmployeeCategoryId; + } + if (!string.IsNullOrEmpty(person.EmployeeSubgroupId)) + { + this.drpEmployeeSubgroup.SelectedValue = person.EmployeeSubgroupId; + } if (!string.IsNullOrEmpty(person.ViceCNProfessionalId)) { this.drpViceCNProfessional.SelectedValueArray = person.ViceCNProfessionalId.Split(','); @@ -162,6 +178,7 @@ namespace FineUIPro.Web.HSSE.SitePerson this.txtAddress.Text = person.Address; this.txtTelephone.Text = person.Telephone; this.txtOutResult.Text = person.OutResult; + this.txtRemarks.Text = person.Remarks; if (person.IsForeign.HasValue) { this.ckIsForeign.Checked = person.IsForeign.Value; @@ -276,7 +293,11 @@ namespace FineUIPro.Web.HSSE.SitePerson PostTitleService.InitPostTitleDropDownList(this.drpTitle, true); TeamGroupService.InitTeamGroupProjectUnitDropDownList(this.drpTeamGroup, this.ProjectId, this.UnitId, true); CertificateService.InitCertificateDropDownList(this.drpCertificate, true); - UserService.InitFlowOperateControlUserDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_TCC, true); + UserService.InitFlowOperateControlUserDropDownList(this.drpAuditor, this.ProjectId, Const.UnitId_XJYJ, true); + EmployeeCategoryService.InitCategoryDropDownList(this.drpEmployeeCategory, true);//人员分类 + EmployeeSubgroupService.InitSubgroupDropDownList(this.drpEmployeeSubgroup, true);//人员子组 + DepartService.InitDepartDropDownList(this.drpDepart, true);//组织单元、部门 + InstitutionalDivisionService.InitInstitutionalDivisionDropDownList(this.drpInstitutionalDivision, true);//机构划分 CNProfessionalService.InitCNProfessionalDownList(this.drpMainCNProfessional, true); CNProfessionalService.InitCNProfessionalDownList(this.drpViceCNProfessional, true); BasicDataService.InitBasicDataProjectUnitDropDownList(this.drpEduLevel, "EDU_LEVEL", true); @@ -463,6 +484,22 @@ namespace FineUIPro.Web.HSSE.SitePerson { person.MaritalStatus = this.drpMaritalStatus.SelectedValue; } + if (this.drpInstitutionalDivision.SelectedValue != Const._Null) + { + person.InstitutionalDivisionId = this.drpInstitutionalDivision.SelectedValue; + } + if (this.drpDepart.SelectedValue != Const._Null) + { + person.DepartId = this.drpDepart.SelectedValue; + } + if (this.drpEmployeeCategory.SelectedValue != Const._Null) + { + person.EmployeeCategoryId = this.drpEmployeeCategory.SelectedValue; + } + if (this.drpEmployeeSubgroup.SelectedValue != Const._Null) + { + person.EmployeeSubgroupId = this.drpEmployeeSubgroup.SelectedValue; + } if (this.drpMainCNProfessional.SelectedValue != Const._Null) { person.MainCNProfessionalId = this.drpMainCNProfessional.SelectedValue; @@ -487,6 +524,7 @@ namespace FineUIPro.Web.HSSE.SitePerson person.Address = this.txtAddress.Text.Trim(); person.Telephone = this.txtTelephone.Text.Trim(); person.OutResult = this.txtOutResult.Text.Trim(); + person.Remarks = this.txtRemarks.Text.Trim(); if (!string.IsNullOrEmpty(this.txtInTime.Text.Trim())) { person.InTime = Convert.ToDateTime(this.txtInTime.Text.Trim()); diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs index 7982003..6147c3a 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.designer.cs @@ -230,6 +230,24 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.Grid gvWorkArea; + /// + /// drpInstitutionalDivision 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpInstitutionalDivision; + + /// + /// drpDepart 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpDepart; + /// /// drpMainCNProfessional 控件。 /// @@ -239,24 +257,6 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.DropDownList drpMainCNProfessional; - /// - /// drpAuditor 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpAuditor; - - /// - /// ckIsForeign 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.CheckBox ckIsForeign; - /// /// txtBirthday 控件。 /// @@ -356,6 +356,24 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.DropDownList drpTeamGroup; + /// + /// drpEmployeeCategory 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpEmployeeCategory; + + /// + /// drpEmployeeSubgroup 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpEmployeeSubgroup; + /// /// drpViceCNProfessional 控件。 /// @@ -365,24 +383,6 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.DropDownList drpViceCNProfessional; - /// - /// txtAuditorDate 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DatePicker txtAuditorDate; - - /// - /// ckIsOutside 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.CheckBox ckIsOutside; - /// /// txtTelephone 控件。 /// @@ -554,6 +554,42 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.RadioButtonList rblIsCardUsed; + /// + /// drpAuditor 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpAuditor; + + /// + /// txtAuditorDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtAuditorDate; + + /// + /// ckIsForeign 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckIsForeign; + + /// + /// ckIsOutside 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBox ckIsOutside; + /// /// txtAddress 控件。 /// @@ -581,6 +617,15 @@ namespace FineUIPro.Web.HSSE.SitePerson /// protected global::FineUIPro.TextBox txtOutResult; + /// + /// txtRemarks 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemarks; + /// /// Window1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs index 4ac4e1f..0f2bd51 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonOut.aspx.cs @@ -45,7 +45,7 @@ namespace FineUIPro.Web.HSSE.SitePerson List listStr = new List(); strSql += " AND ProjectId = @ProjectId"; listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_TCC) + if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && this.CurrUser.UnitId != Const.UnitId_XJYJ) { strSql += " AND UnitId = @UnitId"; listStr.Add(new SqlParameter("@UnitId", this.drpUnitId.SelectedValue)); diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs index d89a41d..41424e1 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonUnitList.aspx.cs @@ -52,7 +52,7 @@ namespace FineUIPro.Web.HSSE.SitePerson } else { - this.drpUnit.SelectedValue = Const.UnitId_TCC; + this.drpUnit.SelectedValue = Const.UnitId_XJYJ; } // 绑定表格 BindGrid(); diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCardView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCardView.aspx.cs index 1883787..b6518c4 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCardView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/SendCardView.aspx.cs @@ -24,7 +24,7 @@ namespace FineUIPro.Web.HSSE.SitePerson { if (!IsPostBack) { - this.lbThisUnit.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC); + this.lbThisUnit.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ); this.lbProject.Text = ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); this.PersonId = Request.Params["PersonId"]; diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.cs index 96f3acf..40a11d1 100644 --- a/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/WorkPostStatistic.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.HSSE.SitePerson this.ProjectId = Request.Params["projectId"]; } UnitService.InitUnitDropDownList(this.drpUnit, this.ProjectId, true); - this.drpUnit.SelectedValue = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + this.drpUnit.SelectedValue = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; if (ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) { this.drpUnit.Enabled = false; diff --git a/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs index 815f595..7c6d252 100644 --- a/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SolutionNew/ConstructSolution.aspx.cs @@ -58,7 +58,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew CNProfessionalService.InitCNProfessionalDownList(drpCNProfessional, true); UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpProposeUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); btnNew.OnClientClick = window_tt.GetShowReference("EditConstructSolution.aspx") + "return false;"; - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { this.drpProposeUnit.Hidden = true; } @@ -138,7 +138,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", CurrUser.LoginProjectId)); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { strSql += " AND chec.UnitId='" + this.CurrUser.UnitId + "'"; } diff --git a/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs index e8849fe..b45e935 100644 --- a/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/SolutionNew/EditConstructSolution.aspx.cs @@ -103,7 +103,7 @@ namespace FineUIPro.Web.HSSE.SolutionNew BLL.SpecialSchemeTypeService.InitSpecialSchemeTypeDropDownList(drpSpecialType,1, false); UnitService.InitUnitByProjectIdUnitTypeDropDownList(drpUnit, CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, false); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_TCC && this.CurrUser.UnitId != Const.hfnbdId) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != Const.UnitId_XJYJ && this.CurrUser.UnitId != Const.hfnbdId) { drpUnit.SelectedValue = this.CurrUser.UnitId; drpUnit.Enabled = false; diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/HazardListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/HazardListEdit.aspx.cs index fa47661..af489bf 100644 --- a/SGGL/FineUIPro.Web/HSSE/Technique/HazardListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Technique/HazardListEdit.aspx.cs @@ -172,7 +172,7 @@ namespace FineUIPro.Web.HSSE.Technique if (string.IsNullOrEmpty(this.HazardId)) { hazardList.CompileMan = this.CurrUser.UserName; - hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; hazardList.CompileDate = DateTime.Now; hazardList.IsPass = true; hazardList.HazardId = SQLHelper.GetNewID(typeof(Model.Technique_HazardList)); diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/HazardListIn.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/HazardListIn.aspx.cs index d3e1311..2735ceb 100644 --- a/SGGL/FineUIPro.Web/HSSE/Technique/HazardListIn.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Technique/HazardListIn.aspx.cs @@ -612,7 +612,7 @@ namespace FineUIPro.Web.HSSE.Technique hazardList.CompileMan = this.CurrUser.UserName; hazardList.CompileDate = DateTime.Now; hazardList.IsPass = true; - hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + hazardList.UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; BLL.HazardListService.AddHazardList(hazardList); BLL.LogService.AddSys_Log(this.CurrUser, hazardList.HazardCode, hazardList.HazardId, BLL.Const.HazardListMenuId, Const.BtnAdd); } diff --git a/SGGL/FineUIPro.Web/HSSE/Technique/RectifyItemEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Technique/RectifyItemEdit.aspx.cs index 4b7ad55..e628c44 100644 --- a/SGGL/FineUIPro.Web/HSSE/Technique/RectifyItemEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/Technique/RectifyItemEdit.aspx.cs @@ -102,7 +102,7 @@ namespace FineUIPro.Web.HSSE.Technique if (string.IsNullOrEmpty(this.RectifyItemId)) { rectifyItem.CompileMan = this.CurrUser.UserName; - rectifyItem.UnitId = String.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + rectifyItem.UnitId = String.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; rectifyItem.CompileDate = DateTime.Now; rectifyItem.IsPass = true; rectifyItem.RectifyItemId = SQLHelper.GetNewID(typeof(Model.Technique_RectifyItem)); diff --git a/SGGL/FineUIPro.Web/Notice/NoticeEdit.aspx.cs b/SGGL/FineUIPro.Web/Notice/NoticeEdit.aspx.cs index 0d0657b..3e77da7 100644 --- a/SGGL/FineUIPro.Web/Notice/NoticeEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Notice/NoticeEdit.aspx.cs @@ -138,7 +138,7 @@ namespace FineUIPro.Web.Notice private void InitDropDownList() { BLL.UserService.InitUserProjectIdUnitIdDropDownList(this.drpCompileMan, this.ProjectId, - (string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId), true); + (string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId), true); this.drpProjects.DataTextField = "ProjectName"; this.drpProjects.DataValueField = "ProjectId"; diff --git a/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs b/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs index 50c6d41..8af004c 100644 --- a/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/OfficeCheck/Check/RectifyEdit.aspx.cs @@ -49,7 +49,7 @@ namespace FineUIPro.Web.OfficeCheck.Check //受检项目 BLL.ProjectService.InitAllProjectDropDownList(this.drpProjectId, true); ///安全经理 - BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_TCC, true); + BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpSignPerson, this.CurrUser.LoginProjectId, Const.UnitId_XJYJ, true); ///检察人员 BLL.UserService.InitFlowOperateControlUserDropDownList(this.drpCheckMan, this.CurrUser.LoginProjectId, null, true); string type = Request.Params["type"]; diff --git a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs index a641970..01c7f21 100644 --- a/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/GJSX/GJSXListEdit.aspx.cs @@ -111,9 +111,9 @@ namespace FineUIPro.Web.PZHGL.GJSX this.UserId = Request.Params["userId"]; this.UnitId = Request.Params["UnitId"]; - if (!string.IsNullOrEmpty(Const.UnitId_TCC)) + if (!string.IsNullOrEmpty(Const.UnitId_XJYJ)) { - this.DropUnitId.SelectedValue = Const.UnitId_TCC; + this.DropUnitId.SelectedValue = Const.UnitId_XJYJ; } // this.drpDepart.SelectedValue = Const.Depart_constructionId; ///角色下拉框 diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionPlanEdit.aspx.cs index 0af0dcf..6779f35 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionPlanEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionPlanEdit.aspx.cs @@ -95,14 +95,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject rblIsAgree.Hidden = true; drpHandleMan.Enabled = true; drpHandleMan.Required = true; - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId)); drpHandleMan.SelectedIndex = 0; } else { //------------ - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId)); HideOptions.Hidden = false; //Url.Visible = true; 附件查看权限 - 1 @@ -121,11 +121,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject drpHandleMan.Items.Clear(); if (State != Const.ConstructionPlan_Audit1) { - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); } else { - UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_TCC, Const.SystemManager, false); + UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_XJYJ, Const.SystemManager, false); } drpHandleMan.Enabled = true; drpHandleMan.Required = true; @@ -145,7 +145,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject State = Const.ConstructionPlan_Compile; ConstructionPlanService.InitHandleType(drpHandleType, false, State); this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); drpHandleMan.SelectedIndex = 0; plApprove2.Hidden = true; string unitId = string.Empty; @@ -364,11 +364,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject drpHandleType.SelectedIndex = 0; if (drpHandleType.SelectedValue != Const.ConstructionPlan_Audit2) { - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); } else { - UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_TCC, Const.SystemManager, false); + UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_XJYJ, Const.SystemManager, false); } drpHandleMan.SelectedIndex = 0; if (drpHandleType.SelectedValue == Const.ConstructionPlan_Complete) @@ -389,11 +389,11 @@ namespace FineUIPro.Web.PZHGL.InformationProject drpHandleType.SelectedIndex = 1; if (drpHandleType.SelectedValue != Const.ConstructionPlan_Audit2) { - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); } else { - UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_TCC, Const.SystemManager, false); + UserService.InitUserProjectIdUnitIdRoleIdDropDownList(drpHandleMan, string.Empty, Const.UnitId_XJYJ, Const.SystemManager, false); } drpHandleMan.SelectedIndex = 0; if (drpHandleType.SelectedValue == Const.ConstructionPlan_ReCompile) diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionReportEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionReportEdit.aspx.cs index 8808191..dafb2c0 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ConstructionReportEdit.aspx.cs @@ -104,14 +104,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject rblIsAgree.Hidden = true; drpHandleMan.Enabled = true; drpHandleMan.Required = true; - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId)); drpHandleMan.SelectedIndex = 0; } else { //------------ - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId)); HideOptions.Hidden = false; //Url.Visible = true; 附件查看权限 - 1 @@ -130,7 +130,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject drpHandleMan.Items.Clear(); //if (State != Const.ConstructionReport_Audit1) //{ - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //} //else //{ @@ -154,7 +154,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject State = Const.ConstructionReport_Compile; ConstructionReportService.InitHandleType(drpHandleType, false, State); this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); drpHandleMan.SelectedIndex = 0; plApprove2.Hidden = true; string unitId = string.Empty; @@ -410,7 +410,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject drpHandleType.SelectedIndex = 0; //if (drpHandleType.SelectedValue != Const.ConstructionReport_Audit2) //{ - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //} //else //{ @@ -435,7 +435,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject drpHandleType.SelectedIndex = 1; //if (drpHandleType.SelectedValue != Const.ConstructionReport_Audit2) //{ - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //} //else //{ diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ReceiveFileManagerEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ReceiveFileManagerEdit.aspx.cs index d059c7d..49a8793 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ReceiveFileManagerEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ReceiveFileManagerEdit.aspx.cs @@ -291,7 +291,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject if (this.rbFileType.SelectedValue == "0") { this.drpUnit.Readonly = true; - string unitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId; + string unitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId; this.drpUnit.SelectedValue = unitId; } else diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/WorkHandoverEdit.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/WorkHandoverEdit.aspx.cs index 4950b3e..2c47268 100644 --- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/WorkHandoverEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/WorkHandoverEdit.aspx.cs @@ -78,8 +78,8 @@ namespace FineUIPro.Web.PZHGL.InformationProject HideOptions.Hidden = true; rblIsAgree.Hidden = true; BindData(); - UserService.InitUserDropDownList(drpTransferMan, CurrUser.LoginProjectId, true, Const.UnitId_TCC); - UserService.InitUserDropDownList(drpReceiveMan, CurrUser.LoginProjectId, true, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpTransferMan, CurrUser.LoginProjectId, true, Const.UnitId_XJYJ); + UserService.InitUserDropDownList(drpReceiveMan, CurrUser.LoginProjectId, true, Const.UnitId_XJYJ); WorkPostService.InitWorkPostNameByTypeDropDownList2(this.drpWorkPost, "1", true); //加载管理岗位 HandleImg = 0; if (!string.IsNullOrEmpty(WorkHandoverId)) @@ -130,14 +130,14 @@ namespace FineUIPro.Web.PZHGL.InformationProject rblIsAgree.Hidden = true; drpHandleMan.Enabled = true; drpHandleMan.Required = true; - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId)); drpHandleMan.SelectedIndex = 0; } else { //------------ - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); //drpHandleMan.Items.AddRange(UserService.GetAllUserList(CurrUser.LoginProjectId)); HideOptions.Hidden = false; //Url.Visible = true; 附件查看权限 - 1 @@ -154,7 +154,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject else { drpHandleMan.Items.Clear(); - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); drpHandleMan.Enabled = true; drpHandleMan.Required = true; } @@ -173,7 +173,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject State = Const.WorkHandover_Compile; WorkHandoverService.InitHandleType(drpHandleType, false, State); this.txtTransferDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); drpHandleMan.SelectedValue = this.CurrUser.UserId; Model.SitePerson_Person person = BLL.PersonService.GetPersonByIdentityCard(this.CurrUser.LoginProjectId, this.CurrUser.IdentityCard); if (person != null) @@ -404,7 +404,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject if (rblIsAgree.SelectedValue.Equals("true")) { drpHandleType.SelectedIndex = 0; - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); drpHandleMan.SelectedIndex = 0; if (drpHandleType.SelectedValue == Const.WorkHandover_Complete) { @@ -422,7 +422,7 @@ namespace FineUIPro.Web.PZHGL.InformationProject { drpHandleMan.Items.Clear(); drpHandleType.SelectedIndex = 1; - UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_TCC); + UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, Const.UnitId_XJYJ); drpHandleMan.SelectedIndex = 0; if (drpHandleType.SelectedValue == Const.WorkHandover_ReCompile) { diff --git a/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs b/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs index fdad42b..a8266b8 100644 --- a/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/EduTrain/TestRecordPrint.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.Person.EduTrain { if (!IsPostBack) { - this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_TCC) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); + this.lbTitleName.Text = UnitService.GetUnitNameByUnitId(Const.UnitId_XJYJ) + ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId); this.lbTestType.Text = "培训试题"; this.TestRecordId = Request.Params["TestRecordId"]; this.Type = Request.Params["Type"]; @@ -63,7 +63,7 @@ namespace FineUIPro.Web.Person.EduTrain { personInfo += "项目：" + ProjectService.GetProjectNameByProjectId(testRecord.ProjectId) + " "; } - else if (testRecord.UnitId == Const.UnitId_TCC) + else if (testRecord.UnitId == Const.UnitId_XJYJ) { personInfo += "部门：" + DepartService.getDepartNameById(testRecord.DepartId) + " "; } diff --git a/SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.cs index 041881b..1737251 100644 --- a/SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonDutyAdd.aspx.cs @@ -30,7 +30,7 @@ namespace FineUIPro.Web.Person if (!IsPostBack) { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true); WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true); this.DutyId = Request.Params["DutyId"]; if (!string.IsNullOrEmpty(this.DutyId)) { diff --git a/SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.cs index 118c466..1e0ccd3 100644 --- a/SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonDutyEdit.aspx.cs @@ -30,9 +30,9 @@ namespace FineUIPro.Web.Person if (!IsPostBack) { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true); WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true); - BLL.UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_TCC, Const.Depart_constructionId,true); + BLL.UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, Const.Depart_constructionId,true); this.DutyId = Request.Params["DutyId"]; if (!string.IsNullOrEmpty(this.DutyId)) { var PersonDuty = BLL.Person_DutyService.GetPersonDutyById(this.DutyId); @@ -116,7 +116,7 @@ namespace FineUIPro.Web.Person if (this.rdbIsAgree.SelectedValue.Contains("false")) { this.drpHandleMan.Hidden = false; - BLL.UserService.InitUserUnitIdDropDownList(drpHandleMan, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, true); this.drpHandleMan.SelectedValue = PersonDuty.DutyPersonId; this.drpHandleMan.Label = "打回责任人"; this.drpHandleMan.Readonly = true; diff --git a/SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.cs index 81cfac8..8cd8133 100644 --- a/SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonDutyView.aspx.cs @@ -14,7 +14,7 @@ namespace FineUIPro.Web.Person if (!IsPostBack) { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpSEDINUser, Const.UnitId_XJYJ, true); WorkPostService.InitMainWorkPostDropDownList(drpWorkPost, true); string DutyId = Request.Params["DutyId"]; if (!string.IsNullOrEmpty(DutyId)) diff --git a/SGGL/FineUIPro.Web/Person/PersonIn.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonIn.aspx.cs index eb34d46..c88f051 100644 --- a/SGGL/FineUIPro.Web/Person/PersonIn.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonIn.aspx.cs @@ -168,7 +168,7 @@ namespace FineUIPro.Web.Person Model.View_Person_User newSysUser = new Model.View_Person_User { RCount = i + 2, - UnitId=Const.UnitId_TCC, + UnitId=Const.UnitId_XJYJ, UserCode = pds.Rows[i][0].ToString().Trim(), UserName = pds.Rows[i][1].ToString().Trim(), Account = pds.Rows[i][2].ToString().Trim(), diff --git a/SGGL/FineUIPro.Web/Person/PersonSet.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonSet.aspx.cs index 779f997..13963e5 100644 --- a/SGGL/FineUIPro.Web/Person/PersonSet.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonSet.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.Person + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId" + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId" + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId" - + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' "; + + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' "; List listStr = new List(); if (!string.IsNullOrEmpty(this.txtUserName.Text.Trim())) diff --git a/SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx.cs index 7ecbae7..55b0fbf 100644 --- a/SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonSetEdit.aspx.cs @@ -76,9 +76,9 @@ namespace FineUIPro.Web.Person ConstValue.InitConstValueDropDownList(this.drpIsOffice, ConstValue.Group_0001, false); UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, true); DepartService.InitDepartDropDownList(this.drpDepart, true); - if (!string.IsNullOrEmpty(Const.UnitId_TCC)) + if (!string.IsNullOrEmpty(Const.UnitId_XJYJ)) { - this.drpUnit.SelectedValue =Const.UnitId_TCC; + this.drpUnit.SelectedValue =Const.UnitId_XJYJ; } this.drpDepart.SelectedValue =Const.Depart_constructionId; ///角色下拉框 diff --git a/SGGL/FineUIPro.Web/Person/PersonTotalEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonTotalEdit.aspx.cs index 2c4cad2..1354c03 100644 --- a/SGGL/FineUIPro.Web/Person/PersonTotalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonTotalEdit.aspx.cs @@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.PersonTotalId = Request.Params["PersonTotalId"]; - BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true); if (!string.IsNullOrEmpty(this.PersonTotalId)) { var totle = BLL.PersonTotalService.GetPersonByPersonTotalId(this.PersonTotalId); diff --git a/SGGL/FineUIPro.Web/Person/PersonTotalView.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonTotalView.aspx.cs index e9ffe27..e0dbc16 100644 --- a/SGGL/FineUIPro.Web/Person/PersonTotalView.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonTotalView.aspx.cs @@ -39,7 +39,7 @@ namespace FineUIPro.Web.Person this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.PersonTotalId = Request.Params["PersonTotalId"]; - BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true); if (!string.IsNullOrEmpty(this.PersonTotalId)) { var totle = BLL.PersonTotalService.GetPersonByPersonTotalId(this.PersonTotalId); diff --git a/SGGL/FineUIPro.Web/Person/PersonTrainingAdd.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonTrainingAdd.aspx.cs index eabeff3..0468da2 100644 --- a/SGGL/FineUIPro.Web/Person/PersonTrainingAdd.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonTrainingAdd.aspx.cs @@ -36,7 +36,7 @@ namespace FineUIPro.Web.Person if (!IsPostBack) { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); - UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_TCC, Const.Depart_constructionId, true); + UserService.InitUserUnitIdDepartIdDropDownList(drpHandleMan, Const.UnitId_XJYJ, Const.Depart_constructionId, true); WorkPostService.InitWorkPostNameByTypeDropDownList2(this.drpWorkPost, "1", true); //加载管理岗位 this.TrainingPlanId = Request.Params["TrainingPlanId"]; if (!string.IsNullOrEmpty(this.TrainingPlanId)) @@ -90,7 +90,7 @@ namespace FineUIPro.Web.Person + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId" + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId" + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId" - + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; + + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; List listStr = new List(); if (this.drpWorkPost.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/Person/PersonTrainingEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonTrainingEdit.aspx.cs index 2f32c4a..d977cc4 100644 --- a/SGGL/FineUIPro.Web/Person/PersonTrainingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonTrainingEdit.aspx.cs @@ -82,7 +82,7 @@ namespace FineUIPro.Web.Person + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId" + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId" + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId" - + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; + + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; List listStr = new List(); var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId; if (personIds.Count() > 0) diff --git a/SGGL/FineUIPro.Web/Person/PersonTrainingView.aspx.cs b/SGGL/FineUIPro.Web/Person/PersonTrainingView.aspx.cs index 29f1e71..03951e1 100644 --- a/SGGL/FineUIPro.Web/Person/PersonTrainingView.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/PersonTrainingView.aspx.cs @@ -83,7 +83,7 @@ namespace FineUIPro.Web.Person + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId" + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId" + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId" - + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; + + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; List listStr = new List(); var personIds = from x in Funs.DB.View_Person_TrainingPerson where x.TrainingPlanId == this.TrainingPlanId select x.TrainingUserId; if (personIds.Count() > 0) diff --git a/SGGL/FineUIPro.Web/Person/Shunt.aspx.cs b/SGGL/FineUIPro.Web/Person/Shunt.aspx.cs index 5ccc4b1..ad2a8df 100644 --- a/SGGL/FineUIPro.Web/Person/Shunt.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/Shunt.aspx.cs @@ -57,7 +57,7 @@ namespace FineUIPro.Web.Person + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId" + @" LEFT JOIN Base_PracticeCertificate AS pc ON pc.PracticeCertificateId=Users.CertificateId" + @" LEFT JOIN Base_Project AS project ON project.projectId=Users.ProjectId" - + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; + + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' AND Users.IsPost =1 "; List listStr = new List(); if (this.drpWorkPost.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/Person/ShuntDetailEdit.aspx.cs b/SGGL/FineUIPro.Web/Person/ShuntDetailEdit.aspx.cs index 66e197b..9180937 100644 --- a/SGGL/FineUIPro.Web/Person/ShuntDetailEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Person/ShuntDetailEdit.aspx.cs @@ -56,7 +56,7 @@ namespace FineUIPro.Web.Person + @" From dbo.Sys_User AS Users" + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId=Users.UnitId" + @" LEFT JOIN Base_PostTitle AS PostTitle ON PostTitle.PostTitleId=Users.PostTitleId" - + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_TCC + "' AND Users.DepartId='" + Const.Depart_constructionId + "' "; + + @" WHERE Users.UserId !='" + Const.sysglyId + "' AND Users.IsPost =1 AND Users.UserId !='" + Const.hfnbdId + "' AND Users.UserId !='" + Const.sedinId + "' AND Unit.UnitId='" + Const.UnitId_XJYJ + "' AND Users.DepartId='" + Const.Depart_constructionId + "' "; List listStr = new List(); if (this.drpWorkPost.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/PersonManage/Test/TestRanking.aspx.cs b/SGGL/FineUIPro.Web/PersonManage/Test/TestRanking.aspx.cs index a9cc1dc..78d765b 100644 --- a/SGGL/FineUIPro.Web/PersonManage/Test/TestRanking.aspx.cs +++ b/SGGL/FineUIPro.Web/PersonManage/Test/TestRanking.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.PersonManage.Test + @" ,(CASE WHEN T.ManType='1' THEN '管理人员' WHEN T.ManType='2' THEN '临时用户' ELSE '作业人员' END) AS ManTypeName" + @" ,T.TestStartTime,T.TotalScore,T.QuestionCount,T.Duration,T.TestEndTime,T.TestScores,T.UnitId,Unit.UnitCode" + @", Unit.UnitName,T.DepartId,Depart.DepartCode,Depart.DepartName,T.ProjectId,Project.ProjectName,T.WorkPostId,T.IdentityCard,T.Telephone" - + @",(CASE WHEN T.UnitId='" +Const.UnitId_TCC+ "' THEN Depart.DepartName ELSE Project.ProjectName END) AS DProjectName" + + @",(CASE WHEN T.UnitId='" +Const.UnitId_XJYJ+ "' THEN Depart.DepartName ELSE Project.ProjectName END) AS DProjectName" + @" FROM Test_TestRecord AS T " + @" LEFT JOIN Test_TestPlan AS P ON T.TestPlanId=P.TestPlanId" + @" LEFT JOIN Base_Unit AS Unit ON T.UnitId=Unit.UnitId" @@ -111,7 +111,7 @@ namespace FineUIPro.Web.PersonManage.Test if (this.isNoT.Checked) { strSql += " AND (T.UnitId !=@UnitIdT)"; - listStr.Add(new SqlParameter("@UnitIdT", Const.UnitId_TCC)); + listStr.Add(new SqlParameter("@UnitIdT", Const.UnitId_XJYJ)); } strSql += " ORDER BY T.TestScores DESC,DATEDIFF(SS,T.TestStartTime,T.TestEndTime) ASC"; SqlParameter[] parameter = listStr.ToArray(); diff --git a/SGGL/FineUIPro.Web/Personal/PersonTotalEdit.aspx.cs b/SGGL/FineUIPro.Web/Personal/PersonTotalEdit.aspx.cs index 0955c65..d447923 100644 --- a/SGGL/FineUIPro.Web/Personal/PersonTotalEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/Personal/PersonTotalEdit.aspx.cs @@ -40,7 +40,7 @@ namespace FineUIPro.Web.Personal this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.PersonTotalId = Request.Params["PersonTotalId"]; - BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true); if (!string.IsNullOrEmpty(this.PersonTotalId)) { var totle = BLL.PersonTotalService.GetPersonByPersonTotalId(this.PersonTotalId); diff --git a/SGGL/FineUIPro.Web/Personal/PersonTotalView.aspx.cs b/SGGL/FineUIPro.Web/Personal/PersonTotalView.aspx.cs index c57f6c8..335d66c 100644 --- a/SGGL/FineUIPro.Web/Personal/PersonTotalView.aspx.cs +++ b/SGGL/FineUIPro.Web/Personal/PersonTotalView.aspx.cs @@ -39,7 +39,7 @@ namespace FineUIPro.Web.Personal this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.PersonTotalId = Request.Params["PersonTotalId"]; - BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_TCC, true); + BLL.UserService.InitUserUnitIdDropDownList(drpUser, Const.UnitId_XJYJ, true); if (!string.IsNullOrEmpty(this.PersonTotalId)) { var totle = BLL.PersonTotalService.GetPersonByPersonTotalId(this.PersonTotalId); diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index 9d69bde..e9ab50f 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -54,7 +54,7 @@ namespace FineUIPro.Web.ProjectData UnitService.InitBranchUnitDropDownList(this.drpUnit, true, true); ConstValue.InitConstValueDropDownList(this.drpProjectState2, ConstValue.GroupId_ProjectState, true); - this.drpUnit.SelectedValue = Const.UnitId_TCC; + this.drpUnit.SelectedValue = Const.UnitId_XJYJ; if (!String.IsNullOrEmpty(this.ProjectId)) { var project = BLL.ProjectService.GetProjectByProjectId(this.ProjectId); diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs index f845135..9539f33 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectUser.aspx.cs @@ -418,7 +418,7 @@ namespace FineUIPro.Web.ProjectData if (pu != null) { var users = UserService.GetUserByUserId(pu.UserId); - if (users != null && CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId) && users.UnitId != Const.UnitId_TCC) + if (users != null && CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId) && users.UnitId != Const.UnitId_XJYJ) { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("../SysManage/UserListEdit.aspx?userId={0}&type=-1", users.UserId, "编辑 - "))); } @@ -447,7 +447,7 @@ namespace FineUIPro.Web.ProjectData if (pu != null) { var users = UserService.GetUserByUserId(pu.UserId); - if (users != null && CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId) && users.UnitId != Const.UnitId_TCC) + if (users != null && CommonService.IsMainUnitOrAdmin(this.CurrUser.UserId) && users.UnitId != Const.UnitId_XJYJ) { string cont = judgementDelete(users.UserId); if (string.IsNullOrEmpty(cont)) diff --git a/SGGL/FineUIPro.Web/SHIYE/InformationProject/SafetyBriefingEdit.aspx.cs b/SGGL/FineUIPro.Web/SHIYE/InformationProject/SafetyBriefingEdit.aspx.cs index ecd5364..64cdcc7 100644 --- a/SGGL/FineUIPro.Web/SHIYE/InformationProject/SafetyBriefingEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/SHIYE/InformationProject/SafetyBriefingEdit.aspx.cs @@ -110,7 +110,7 @@ namespace FineUIPro.Web.SHIYE.InformationProject //DateTime endTime = startTime.AddMonths(1); //GetData(startTime, endTime); this.drpCompileMan.SelectedValue = this.CurrUser.UserId; - this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId); + this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId); } } } @@ -168,7 +168,7 @@ namespace FineUIPro.Web.SHIYE.InformationProject Model.InformationProject_SafetyBriefing safetyBriefing = new Model.InformationProject_SafetyBriefing { ProjectId = this.ProjectId, - UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_TCC : this.CurrUser.UnitId, + UnitId = string.IsNullOrEmpty(this.CurrUser.UnitId) ? Const.UnitId_XJYJ : this.CurrUser.UnitId, }; if (this.drpYear.SelectedValue != BLL.Const._Null) { diff --git a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs index a7a88e0..ede45e3 100644 --- a/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/SysConstSet.aspx.cs @@ -1329,7 +1329,7 @@ namespace FineUIPro.Web.SysManage client.Timeout = -1; var request = new RestRequest(Method.POST); ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; - var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); request.AddParameter("UnitName", thisUnit.UnitName); request.AddParameter("CollCropCode", thisUnit.CollCropCode); IRestResponse response = client.Execute(request); @@ -1358,7 +1358,7 @@ namespace FineUIPro.Web.SysManage var client = new RestClient(baseurl); client.Timeout = -1; var request = new RestRequest(Method.POST); - var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); request.AddHeader("ClientId", ClientId); request.AddHeader("OperationCode", "cn.cncec.group.qhsePROD.common.GetToken"); request.AddParameter("UnitName", thisUnit.UnitName); diff --git a/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs b/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs index 45f044c..3c14213 100644 --- a/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/Unit.aspx.cs @@ -225,7 +225,7 @@ namespace FineUIPro.Web.SysManage { string content = string.Empty; var unit =Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == id) ; - if (unit != null && unit.UnitId == Const.UnitId_TCC) + if (unit != null && unit.UnitId == Const.UnitId_XJYJ) { content += "【本单位】，不能删除！"; } diff --git a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs index eec6c86..c8594e4 100644 --- a/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs +++ b/SGGL/FineUIPro.Web/SysManage/UserList.aspx.cs @@ -386,7 +386,7 @@ { UserId = SQLHelper.GetNewID(), }; - sysUser.UnitId = BLL.Const.UnitId_TCC; + sysUser.UnitId = BLL.Const.UnitId_XJYJ; sysUser.UserCode = domainAccount; sysUser.UserName = full_name; sysUser.Telephone = cellphone; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMSEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMSEdit.aspx.cs index aa7be1c..51451a9 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMSEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/CQMSData_CQMSEdit.aspx.cs @@ -180,7 +180,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -204,7 +204,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } Model.CQMSData_CQMS table = new Model.CQMSData_CQMS(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; table.ReportDate = this.txtReportDate.SelectedDate; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGLEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGLEdit.aspx.cs index d791285..fa54597 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGLEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/HJGLData_HJGLEdit.aspx.cs @@ -73,7 +73,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -111,7 +111,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } Model.HJGLData_HJGL table = new Model.HJGLData_HJGL(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; table.ReportDate = this.txtReportDate.SelectedDate; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs index ec4953b..12ced24 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/HSSEData_HSSEEdit.aspx.cs @@ -334,7 +334,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -389,7 +389,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } Model.HSSEData_HSSE table = new Model.HSSEData_HSSE(); - table.UnitId = Const.UnitId_TCC; + table.UnitId = Const.UnitId_XJYJ; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; table.ReportDate = this.txtReportDate.SelectedDate; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs index 8c63d7c..620141e 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs @@ -180,7 +180,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -204,7 +204,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } Model.Project_CQMSData_CQMS table = new Model.Project_CQMSData_CQMS(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.ProjectId = this.CurrUser.LoginProjectId; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs index 2fd15ce..2923e16 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs @@ -74,7 +74,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -112,7 +112,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } Model.Project_HJGLData_HJGL table = new Model.Project_HJGLData_HJGL(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.ProjectId = this.CurrUser.LoginProjectId; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs index 12ca253..8066580 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs @@ -334,7 +334,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -389,7 +389,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } Model.Project_HSSEData_HSSE table = new Model.Project_HSSEData_HSSE(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.ProjectId = this.CurrUser.LoginProjectId; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEEdit.aspx.cs index 47a45d9..c9d3818 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_SYHSEData_SYHSEEdit.aspx.cs @@ -188,7 +188,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -212,7 +212,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync } Model.Project_SYHSEData_SYHSE table = new Model.Project_SYHSEData_SYHSE(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.ProjectId = this.CurrUser.LoginProjectId; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSEEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSEEdit.aspx.cs index 397b26a..60118e5 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSEEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/SYHSEData_SYHSEEdit.aspx.cs @@ -188,7 +188,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } else { - var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var base_Unit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); txtUnitName.Text = base_Unit.UnitName; txtCollCropCode.Text = base_Unit.CollCropCode; txtReportDate.SelectedDate = DateTime.Now; @@ -212,7 +212,7 @@ namespace FineUIPro.Web.ZHGL.DataSync } Model.SYHSEData_SYHSE table = new Model.SYHSEData_SYHSE(); - table.UnitId = BLL.Const.UnitId_TCC; + table.UnitId = BLL.Const.UnitId_XJYJ; table.CollCropCode = this.txtCollCropCode.Text; table.UnitName = this.txtUnitName.Text; table.ReportDate = this.txtReportDate.SelectedDate; diff --git a/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs index 5b69e17..ad4ce0a 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordList.aspx.cs @@ -40,7 +40,7 @@ namespace FineUIPro.Web.ZHGL.Emergency { ////权限按钮方法 this.GetButtonPower(); - this.UnitId = BLL.Const.UnitId_TCC; + this.UnitId = BLL.Const.UnitId_XJYJ; this.btnNew.OnClientClick = Window1.GetShowReference("DrillRecordListEdit.aspx") + "return false;"; if (this.CurrUser != null && this.CurrUser.PageSize.HasValue) diff --git a/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordListEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordListEdit.aspx.cs index 80b9281..5eff76c 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Emergency/DrillRecordListEdit.aspx.cs @@ -100,7 +100,7 @@ namespace FineUIPro.Web.ZHGL.Emergency private void InitDropDownList() { //BLL.UnitService.InitUnitDropDownList(this.drpUnits, this.ProjectId, false); - var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); if (thisUnit != null) { this.txtUnit.Text = thisUnit.UnitName; diff --git a/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyList.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyList.aspx.cs index e91db05..5440e45 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyList.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyList.aspx.cs @@ -37,7 +37,7 @@ namespace FineUIPro.Web.ZHGL.Emergency Funs.DropDownPageSize(this.ddlPageSize); ////权限按钮方法 this.GetButtonPower(); - this.UnitId = BLL.Const.UnitId_TCC; + this.UnitId = BLL.Const.UnitId_XJYJ; //BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true); //if (BLL.ProjectUnitService.GetProjectUnitTypeByProjectIdUnitId(this.ProjectId, this.CurrUser.UnitId)) diff --git a/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyListEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyListEdit.aspx.cs index a5a3e81..d5ce68b 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyListEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Emergency/EmergencyListEdit.aspx.cs @@ -103,7 +103,7 @@ namespace FineUIPro.Web.ZHGL.Emergency /// private void InitDropDownList() { - var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); if (thisUnit != null) { this.txtUnit.Text = thisUnit.UnitName; diff --git a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEOrganize.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEOrganize.aspx.cs index 91b7315..ba68c19 100644 --- a/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEOrganize.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/HSSESystem/HSSEOrganize.aspx.cs @@ -20,7 +20,7 @@ namespace FineUIPro.Web.ZHGL.HSSESystem ////权限按钮方法 this.GetButtonPower(); - this.hdUnitId.Text = BLL.Const.UnitId_TCC; + this.hdUnitId.Text = BLL.Const.UnitId_XJYJ; var organize = BLL.HSSEOrganizeService.GetHSSEOrganizeByUnitId(this.hdUnitId.Text); if (organize != null) { diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs index bf6112c..356fa04 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs @@ -816,7 +816,7 @@ namespace FineUIPro.Web.ZHGL.Information where projectIds.Contains(x.ProjectId) select x).ToList(); - if (this.CurrUser.UnitId == Const.UnitId_TCC) + if (this.CurrUser.UnitId == Const.UnitId_XJYJ) { projects = BLL.ProjectService.GetProjectWorkList(); } diff --git a/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs index 9013e15..6009074 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Information/ReportSubmit.aspx.cs @@ -59,7 +59,7 @@ namespace FineUIPro.Web.ZHGL.Information /// private void BindGrid() { - string unitId = Const.UnitId_TCC; + string unitId = Const.UnitId_XJYJ; string strSql = @"SELECT UserId,UserName,UserCode,role.RoleName" + @" FROM Sys_User AS users" diff --git a/SGGL/FineUIPro.Web/ZHGL/Person/BranchPerson.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Person/BranchPerson.aspx.cs index f7fab27..f807695 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Person/BranchPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Person/BranchPerson.aspx.cs @@ -24,7 +24,7 @@ namespace FineUIPro.Web.ZHGL.Person Funs.DropDownPageSize(this.ddlPageSize); BLL.UnitService.InitNoThisAllUnitDownList(this.drpUnit, false); Funs.FineUIPleaseSelect(drpUnit, "按单位查询"); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_TCC) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ) { this.drpUnit.Enabled = false; this.drpUnit.SelectedValue = this.CurrUser.UnitId; @@ -63,7 +63,7 @@ namespace FineUIPro.Web.ZHGL.Person listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text.Trim() + "%")); } strSql += " AND CompanyBranchPerson.UnitId != @UnitId2"; - listStr.Add(new SqlParameter("@UnitId2", BLL.Const.UnitId_TCC)); + listStr.Add(new SqlParameter("@UnitId2", BLL.Const.UnitId_XJYJ)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/FineUIPro.Web/ZHGL/Person/BranchPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Person/BranchPersonEdit.aspx.cs index 02d44e5..5940032 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Person/BranchPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Person/BranchPersonEdit.aspx.cs @@ -53,7 +53,7 @@ namespace FineUIPro.Web.ZHGL.Person this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); string type = Request.Params["type"]; BLL.UnitService.InitNoThisAllUnitDownList(this.drpUnit, true); - if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_TCC) + if (this.CurrUser.UnitId != null && this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ) { this.drpUnit.Enabled = false; this.drpUnit.SelectedValue = this.CurrUser.UnitId; diff --git a/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs index beb5637..de2d267 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPerson.aspx.cs @@ -50,7 +50,7 @@ namespace FineUIPro.Web.ZHGL.Person listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text.Trim() + "%")); } strSql += " AND CompanyBranchPerson.UnitId = @UnitId"; - listStr.Add(new SqlParameter("@UnitId", BLL.Const.UnitId_TCC)); + listStr.Add(new SqlParameter("@UnitId", BLL.Const.UnitId_XJYJ)); SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter); diff --git a/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs index a1843a4..5ed4e7f 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonEdit.aspx.cs @@ -120,7 +120,7 @@ namespace FineUIPro.Web.ZHGL.Person { newCompanyBranchPerson.WorkPostId = this.drpWorkPost.SelectedValue; } - newCompanyBranchPerson.UnitId = BLL.Const.UnitId_TCC; + newCompanyBranchPerson.UnitId = BLL.Const.UnitId_XJYJ; if (string.IsNullOrEmpty(this.CompanyBranchPersonId)) { if (string.IsNullOrEmpty(this.hdCompanyBranchPersonId.Text)) diff --git a/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonIn.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonIn.aspx.cs index 6f6e181..046f8e0 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonIn.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Person/CompanyPersonIn.aspx.cs @@ -351,7 +351,7 @@ namespace FineUIPro.Web.ZHGL.Person { Model.Person_CompanyBranchPerson companyBranchPerson = new Model.Person_CompanyBranchPerson(); companyBranchPerson.CompanyBranchPersonId = Guid.NewGuid().ToString(); - companyBranchPerson.UnitId = BLL.Const.UnitId_TCC; + companyBranchPerson.UnitId = BLL.Const.UnitId_XJYJ; companyBranchPerson.PersonName = row[0].ToString().Trim(); companyBranchPerson.Sex = row[1].ToString().Trim() == "男" ? "1" : "2"; companyBranchPerson.IdentityCard = row[2].ToString(); diff --git a/SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx.cs index 2834fa4..1431779 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx.cs @@ -25,7 +25,7 @@ namespace FineUIPro.Web.ZHGL.Person { this.drpProject.SelectedValue = this.CurrUser.LoginProjectId; this.drpProject.Readonly = true; - if (this.CurrUser.UnitId != BLL.Const.UnitId_TCC && !string.IsNullOrEmpty(this.CurrUser.UnitId)) + if (this.CurrUser.UnitId != BLL.Const.UnitId_XJYJ && !string.IsNullOrEmpty(this.CurrUser.UnitId)) { UnitService.InitUnitDropDownList(this.drpUnit, this.drpProject.SelectedValue, false); Funs.FineUIPleaseSelect(drpUnit, "按单位查询"); diff --git a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs index e4aa148..7e42814 100644 --- a/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/RealName/SynchroSet.aspx.cs @@ -45,7 +45,7 @@ namespace FineUIPro.Web.ZHGL.RealName { Model.RealName_SynchroSet newSynchroSet = new Model.RealName_SynchroSet { - UnitId = Const.UnitId_TCC, + UnitId = Const.UnitId_XJYJ, ApiUrl = Funs.RealNameApiUrl, ClientId = this.txtclientId.Text.Trim(), UserName = this.txtUserName.Text.Trim(), @@ -66,7 +66,7 @@ namespace FineUIPro.Web.ZHGL.RealName { Model.RealName_SynchroSet newSynchroSet = new Model.RealName_SynchroSet { - UnitId = Const.UnitId_TCC, + UnitId = Const.UnitId_XJYJ, ApiUrl = Funs.RealNameApiUrl, ClientId = this.txtclientId.Text.Trim(), UserName = this.txtUserName.Text.Trim(), @@ -236,7 +236,7 @@ namespace FineUIPro.Web.ZHGL.RealName { if (!string.IsNullOrEmpty(getpro.ContractNo)) { - var getSynchroSet = SynchroSetService.GetSynchroSetByUnitId(Const.UnitId_TCC, getpro.ContractNo); + var getSynchroSet = SynchroSetService.GetSynchroSetByUnitId(Const.UnitId_XJYJ, getpro.ContractNo); if (getSynchroSet != null) { this.txtapiUrl.Text = Funs.RealNameApiUrl; diff --git a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx.cs index f1ce085..3099bf3 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/SubUnitReport.aspx.cs @@ -157,7 +157,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck this.dpkReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now); this.txtPlanReortDate.Text = string.Empty; this.formTitle.Title = string.Empty; - var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_TCC); + var thisUnit = BLL.UnitService.GetUnitByUnitId(BLL.Const.UnitId_XJYJ); if (thisUnit != null) { this.txtUnitName.Text = thisUnit.UnitName; diff --git a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReportEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReportEdit.aspx.cs index 590e989..b759fc5 100644 --- a/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/ServerCheck/UpCheckReportEdit.aspx.cs @@ -240,7 +240,7 @@ namespace FineUIPro.Web.ZHGL.ServerCheck //{ Model.Supervise_UpCheckReport newUpCheckReport = new Model.Supervise_UpCheckReport { - UnitId = BLL.Const.UnitId_TCC,//thisUnit.UnitId, + UnitId = BLL.Const.UnitId_XJYJ,//thisUnit.UnitId, Values1 = this.txtValues1.Text.Trim(), Values2 = this.txtValues2.Text.Trim(), Values3 = this.txtValues3.Text.Trim(), diff --git a/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckRectify.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckRectify.aspx.cs index 6ef81ab..f417019 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckRectify.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckRectify.aspx.cs @@ -47,7 +47,7 @@ namespace FineUIPro.Web.ZHGL.Supervise strSql += " AND (SuperviseCheckRectifyCode like @name OR ProjectName like @name OR UnitName like @name OR HandleState like @name)"; listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%")); } - if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_TCC != this.CurrUser.UnitId) + if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_XJYJ != this.CurrUser.UnitId) { strSql += " AND ProjectUnitId = @UnitId"; listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId)); diff --git a/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckReport.aspx.cs index b1ad0a1..8b23400 100644 --- a/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckReport.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/Supervise/SuperviseCheckReport.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.ZHGL.Supervise strSql += " AND (S.SuperviseCheckReportCode like @name OR P.ProjectName like @name OR u.UnitName like @name OR S.CheckTeam like @name OR S.EvaluationResult like @name)"; listStr.Add(new SqlParameter("@name", "%" + this.txtName.Text.Trim() + "%")); } - if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_TCC != this.CurrUser.UnitId) + if (!string.IsNullOrEmpty(this.CurrUser.UnitId) && BLL.Const.UnitId_XJYJ != this.CurrUser.UnitId) { strSql += " AND P.UnitId = @UnitId"; listStr.Add(new SqlParameter("@UnitId", this.CurrUser.UnitId)); diff --git a/SGGL/FineUIPro.Web/common/mainMenu_CQMS_1.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_CQMS_1.aspx.cs index ff535c2..365a92d 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_CQMS_1.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_CQMS_1.aspx.cs @@ -23,7 +23,7 @@ namespace FineUIPro.Web { get { - if (CurrUser.UnitId == Const.UnitId_TCC) + if (CurrUser.UnitId == Const.UnitId_XJYJ) { return Funs.DB.BS_Welder.Where(x => x.ProjectId == CurrUser.LoginProjectId).Count().ToString(); } diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs index c1cce67..2aa9272 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_HJGL.aspx.cs @@ -201,7 +201,7 @@ namespace FineUIPro.Web WelderNumDef = string.Empty; var punit = Funs.DB.Project_ProjectUnit.FirstOrDefault(x=>x.ProjectId==CurrUser.LoginProjectId&&x.UnitId==CurrUser.UnitId); - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId||(punit!=null && (punit.UnitType== BLL.Const.ProjectUnitType_3|| punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId||(punit!=null && (punit.UnitType== BLL.Const.ProjectUnitType_3|| punit.UnitType == BLL.Const.ProjectUnitType_4))) { var welders = from x in Funs.DB.BS_Welder where x.ProjectId == CurrUser.LoginProjectId && x.WED_IfOnGuard == true select x; var projectUnits = from x in Funs.DB.Base_Unit @@ -226,7 +226,7 @@ namespace FineUIPro.Web WelderNumDef += (unitName + ": " + welders.Count().ToString()); } string strSql = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { strSql = @"select SUM(cht_totalfilm) AS current_total_film @@ -261,7 +261,7 @@ namespace FineUIPro.Web string sql41 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql41 = @"select WorkArea.WorkAreaId,WorkArea.WorkAreaName ,SUM(cht_totalfilm) AS total_film , SUM(cht_passfilm) AS pass_film from CH_CheckItem ch_checkitem left @@ -300,7 +300,7 @@ namespace FineUIPro.Web string sql42 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql42 = @"select unit.UnitId,unit.UnitName ,SUM(cht_totalfilm) AS total_film , SUM(cht_passfilm) AS pass_film from CH_CheckItem ch_checkitem left @@ -339,7 +339,7 @@ namespace FineUIPro.Web string sql31 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql31 = @"SELECT WorkArea.WorkAreaId,WorkArea.WorkAreaName, sum(JOT_Size) total_jot , SUM(JOT_DoneDin) finished_total_jot @@ -376,7 +376,7 @@ namespace FineUIPro.Web string sql32 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql32 = @"SELECT unit.UnitId,unit.UnitName, SUM(JOT_Size) total_jot , SUM( JOT_DoneDin ) finished_total_jot @@ -413,7 +413,7 @@ namespace FineUIPro.Web string sql5 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql5 = @"select Defects_Definition ,count(*) as num from CH_CheckItem a left join CH_Check b on a.CHT_CheckID=b.CHT_CheckID where b.ProjectId='" + CurrUser.LoginProjectId + @"' and Defects_Definition <>'' and CHT_CheckResult='不合格' @@ -435,7 +435,7 @@ namespace FineUIPro.Web data55 = data55.TrimEnd(','); } string sql6 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql6 = @"SELECT COUNT(*) total_jot , SUM(case when pw_isoinfo.[Is_Standard] = 0 then JOT_Size else pw_jointinfo.JOT_Size end) AS total_din ,SUM(JOT_DoneDin) AS finished_total_din , @@ -498,7 +498,7 @@ namespace FineUIPro.Web string sql11 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql11 = @"SELECT DAY(jot_welddate) as [day],MONTH(jot_welddate) as [month], COUNT(*) finished_total_jot_bq , @@ -529,7 +529,7 @@ namespace FineUIPro.Web DataTable tb11 = SQLHelper.GetDataTableRunText(sql11); string sql12 = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId || (punit != null && (punit.UnitType == BLL.Const.ProjectUnitType_3 || punit.UnitType == BLL.Const.ProjectUnitType_4))) { sql12 = @" select [day],[month], COUNT(distinct JOT_CellWelder) as WelderNum from(SELECT DAY(jot_welddate) as [day], MONTH(jot_welddate) as [month], JOT_CellWelder diff --git a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs index b56e0c7..403e25c 100644 --- a/SGGL/FineUIPro.Web/common/mainProject.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject.aspx.cs @@ -458,7 +458,7 @@ namespace FineUIPro.Web.common //} string strSql = ""; - if (CurrUser.UnitId == Const.UnitId_TCC || CurrUser.UserId == Const.hfnbdId) + if (CurrUser.UnitId == Const.UnitId_XJYJ || CurrUser.UserId == Const.hfnbdId) { strSql = @"select SUM(cht_totalfilm) AS current_total_film diff --git a/SGGL/FineUIPro.Web/indexProject.aspx.cs b/SGGL/FineUIPro.Web/indexProject.aspx.cs index e2fbc35..696626a 100644 --- a/SGGL/FineUIPro.Web/indexProject.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProject.aspx.cs @@ -650,7 +650,7 @@ namespace FineUIPro.Web protected void btnHome_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(this.CurrUser.LastProjectId) - && ((this.CurrUser.UnitId == Const.UnitId_TCC && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId)) + && ((this.CurrUser.UnitId == Const.UnitId_XJYJ && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId)) { UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId); this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId; diff --git a/SGGL/FineUIPro.Web/indexProjects.aspx.cs b/SGGL/FineUIPro.Web/indexProjects.aspx.cs index 464354b..17c11dc 100644 --- a/SGGL/FineUIPro.Web/indexProjects.aspx.cs +++ b/SGGL/FineUIPro.Web/indexProjects.aspx.cs @@ -579,7 +579,7 @@ namespace FineUIPro.Web protected void btnHome_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(this.CurrUser.LastProjectId) - && ((this.CurrUser.UnitId == Const.UnitId_TCC && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId)) + && ((this.CurrUser.UnitId == Const.UnitId_XJYJ && this.CurrUser.IsOffice == true) || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId)) { UserService.UpdateLastUserInfo(this.CurrUser.UserId, this.CurrUser.LastMenuType, false, this.CurrUser.LoginProjectId); this.CurrUser.LastProjectId = this.CurrUser.LoginProjectId; diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index a7db5f4..02e3638 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -343753,6 +343753,16 @@ namespace Model private string _InstitutionalDivisionId; + private string _Remarks; + + private string _EmployeeCategoryName; + + private string _EmployeeSubgroupName; + + private string _InstitutionalDivisionName; + + private string _DepartName; + private EntitySet _Accident_AccidentPersonRecord; private EntitySet _Accident_AccidentReportOtherItem; @@ -343951,6 +343961,16 @@ namespace Model partial void OnEmployeeSubgroupIdChanged(); partial void OnInstitutionalDivisionIdChanging(string value); partial void OnInstitutionalDivisionIdChanged(); + partial void OnRemarksChanging(string value); + partial void OnRemarksChanged(); + partial void OnEmployeeCategoryNameChanging(string value); + partial void OnEmployeeCategoryNameChanged(); + partial void OnEmployeeSubgroupNameChanging(string value); + partial void OnEmployeeSubgroupNameChanged(); + partial void OnInstitutionalDivisionNameChanging(string value); + partial void OnInstitutionalDivisionNameChanged(); + partial void OnDepartNameChanging(string value); + partial void OnDepartNameChanged(); #endregion public SitePerson_Person() @@ -345379,6 +345399,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(500)")] + public string Remarks + { + get + { + return this._Remarks; + } + set + { + if ((this._Remarks != value)) + { + this.OnRemarksChanging(value); + this.SendPropertyChanging(); + this._Remarks = value; + this.SendPropertyChanged("Remarks"); + this.OnRemarksChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmployeeCategoryName", DbType="VarChar(50)")] + public string EmployeeCategoryName + { + get + { + return this._EmployeeCategoryName; + } + set + { + if ((this._EmployeeCategoryName != value)) + { + this.OnEmployeeCategoryNameChanging(value); + this.SendPropertyChanging(); + this._EmployeeCategoryName = value; + this.SendPropertyChanged("EmployeeCategoryName"); + this.OnEmployeeCategoryNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmployeeSubgroupName", DbType="VarChar(50)")] + public string EmployeeSubgroupName + { + get + { + return this._EmployeeSubgroupName; + } + set + { + if ((this._EmployeeSubgroupName != value)) + { + this.OnEmployeeSubgroupNameChanging(value); + this.SendPropertyChanging(); + this._EmployeeSubgroupName = value; + this.SendPropertyChanged("EmployeeSubgroupName"); + this.OnEmployeeSubgroupNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstitutionalDivisionName", DbType="VarChar(50)")] + public string InstitutionalDivisionName + { + get + { + return this._InstitutionalDivisionName; + } + set + { + if ((this._InstitutionalDivisionName != value)) + { + this.OnInstitutionalDivisionNameChanging(value); + this.SendPropertyChanging(); + this._InstitutionalDivisionName = value; + this.SendPropertyChanged("InstitutionalDivisionName"); + this.OnInstitutionalDivisionNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartName", DbType="VarChar(50)")] + public string DepartName + { + get + { + return this._DepartName; + } + set + { + if ((this._DepartName != value)) + { + this.OnDepartNameChanging(value); + this.SendPropertyChanging(); + this._DepartName = value; + this.SendPropertyChanged("DepartName"); + this.OnDepartNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentPersonRecord_SitePerson_Person", Storage="_Accident_AccidentPersonRecord", ThisKey="PersonId", OtherKey="PersonId", DeleteRule="NO ACTION")] public EntitySet Accident_AccidentPersonRecord { @@ -456208,10 +456328,20 @@ namespace Model private string _PostTitleId; + private string _InstitutionalDivisionId; + + private string _EmployeeCategoryId; + + private string _EmployeeSubgroupId; + + private string _DepartId; + private string _PhotoUrl; private bool _IsUsed; + private string _Remarks; + private string _IsUsedName; private bool _IsCardUsed; @@ -456242,6 +456372,12 @@ namespace Model private string _DepartName; + private string _EmployeeCategoryName; + + private string _EmployeeSubgroupName; + + private string _InstitutionalDivisionName; + private string _PostType; private System.Nullable _IsHsse; @@ -456630,6 +456766,70 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstitutionalDivisionId", DbType="VarChar(50)")] + public string InstitutionalDivisionId + { + get + { + return this._InstitutionalDivisionId; + } + set + { + if ((this._InstitutionalDivisionId != value)) + { + this._InstitutionalDivisionId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmployeeCategoryId", DbType="VarChar(50)")] + public string EmployeeCategoryId + { + get + { + return this._EmployeeCategoryId; + } + set + { + if ((this._EmployeeCategoryId != value)) + { + this._EmployeeCategoryId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmployeeSubgroupId", DbType="VarChar(50)")] + public string EmployeeSubgroupId + { + get + { + return this._EmployeeSubgroupId; + } + set + { + if ((this._EmployeeSubgroupId != value)) + { + this._EmployeeSubgroupId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DepartId", DbType="NVarChar(50)")] + public string DepartId + { + get + { + return this._DepartId; + } + set + { + if ((this._DepartId != value)) + { + this._DepartId = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PhotoUrl", DbType="NVarChar(2000)")] public string PhotoUrl { @@ -456662,6 +456862,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(500)")] + public string Remarks + { + get + { + return this._Remarks; + } + set + { + if ((this._Remarks != value)) + { + this._Remarks = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsUsedName", DbType="VarChar(2) NOT NULL", CanBeNull=false)] public string IsUsedName { @@ -456902,6 +457118,54 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmployeeCategoryName", DbType="NVarChar(100)")] + public string EmployeeCategoryName + { + get + { + return this._EmployeeCategoryName; + } + set + { + if ((this._EmployeeCategoryName != value)) + { + this._EmployeeCategoryName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EmployeeSubgroupName", DbType="NVarChar(100)")] + public string EmployeeSubgroupName + { + get + { + return this._EmployeeSubgroupName; + } + set + { + if ((this._EmployeeSubgroupName != value)) + { + this._EmployeeSubgroupName = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InstitutionalDivisionName", DbType="NVarChar(100)")] + public string InstitutionalDivisionName + { + get + { + return this._InstitutionalDivisionName; + } + set + { + if ((this._InstitutionalDivisionName != value)) + { + this._InstitutionalDivisionName = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PostType", DbType="NChar(1)")] public string PostType { diff --git a/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs b/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs index 08fcf30..1cdc0c0 100644 --- a/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs +++ b/SGGL/WebAPI/Controllers/HSSE/PersonQualityController.cs @@ -54,7 +54,7 @@ namespace WebAPI.Controllers { Model.CNPCDB db = new Model.CNPCDB(Funs.ConnString); int tatalCount = 0, count1 = 0, count2 = 0, count3 = 0, count4 = 0; - bool isSub = !(unitId == Const.UnitId_TCC); + bool isSub = !(unitId == Const.UnitId_XJYJ); if (qualityType == "1") { var getPersons = from x in db.SitePerson_Person diff --git a/SGGL/WebAPI/Controllers/Person/PersonController.cs b/SGGL/WebAPI/Controllers/Person/PersonController.cs index 20fb6a6..53218c3 100644 --- a/SGGL/WebAPI/Controllers/Person/PersonController.cs +++ b/SGGL/WebAPI/Controllers/Person/PersonController.cs @@ -171,7 +171,7 @@ namespace WebAPI.Controllers where x.ProjectId == projectId && (strUnitId == null || x.UnitId == strUnitId) && (strWorkPostId == null || x.WorkPostId == strWorkPostId) select x; - if (unitId != Const.UnitId_TCC && !string.IsNullOrEmpty(unitId)) + if (unitId != Const.UnitId_XJYJ && !string.IsNullOrEmpty(unitId)) { getViews = getViews.Where(x => x.UnitId == unitId); }