diff --git a/DataBase/版本日志/SUBQHSE_V2026-07-15-xiaj（数据治理项目申请预立项）.sql b/DataBase/版本日志/SUBQHSE_V2026-07-15-xiaj（数据治理项目申请预立项）.sql
new file mode 100644
index 0000000..30e5a2d
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-07-15-xiaj（数据治理项目申请预立项）.sql
@@ -0,0 +1,121 @@
+
+--˾ĿԤ
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '204ACA82-15B4-4C80-AE9F-ACF25CE79876')
+BEGIN
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'204ACA82-15B4-4C80-AE9F-ACF25CE79876', N'ĿԤ', N'ProjectData/PreProjectApplyList.aspx', 81, 'C2297533-B7C0-441E-B29F-ADE87C6F8978', 'Menu_SysSet', 1,1, 1);
+END
+GO
+
+----˾ĿԤ
+--IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '204ACA82-15B4-4C80-AE9F-ACF25CE79876')
+--BEGIN
+-- INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+-- VALUES (N'204ACA82-15B4-4C80-AE9F-ACF25CE79876', N'ĿԤ', N'ProjectData/PreProjectApplyList.aspx', 41, N'0', N'Menu_System_Hsse_S_SysSet', 1,1, 1);
+--END
+--GO
+
+
+--ĿԤ
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'DataGovernance_PreProjectApply') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[DataGovernance_PreProjectApply](
+ [Id] [nvarchar](50) NOT NULL,
+ [UnitId] [nvarchar](200) NOT NULL,
+ [UnitName] [nvarchar](200) NOT NULL,
+ [ProjectName] [nvarchar](200) NOT NULL,
+ [ApplyType] [nvarchar](50) NOT NULL,
+ [ApplyUserId] [nvarchar](50) NOT NULL,
+ [ApplyUserName] [nvarchar](200) NOT NULL,
+ [ApplyDescription] [nvarchar](200) NULL,
+ [ApplyDate] [datetime] NOT NULL,
+ [ApproverUserId] [nvarchar](50) NULL,
+ [ApproverUserName] [nvarchar](200) NULL,
+ [ApprovalDescription] [nvarchar](200) NULL,
+ [ApprovalDate] [datetime] NULL,
+ [State] [int] NOT NULL,
+ CONSTRAINT [PK_DataGovernance_PreProjectApply] 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].[DataGovernance_PreProjectApply] ADD CONSTRAINT [DF_DataGovernance_PreProjectApply_ApplyDate] DEFAULT (getdate()) FOR [ApplyDate]
+ALTER TABLE [dbo].[DataGovernance_PreProjectApply] ADD CONSTRAINT [DF_DataGovernance_PreProjectApply_ApplyState] DEFAULT ((0)) FOR [State]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @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'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ProjectName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApplyType'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApplyUserId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApplyUserName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˵' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApplyDescription'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApplyDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApproverUserId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApproverUserName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˵' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApprovalDescription'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'ApprovalDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬0ˣ1ͨ2ͨ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'DataGovernance_PreProjectApply', @level2type=N'COLUMN',@level2name=N'State'
+END
+
+GO
+
+
+
+/*************************************Ŀܱ********************************************************/
+
+--Ŀܱáδر
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_MasterDataAnalysis' AND COLUMN_NAME = 'BuYongBuShiYong')
+BEGIN
+ --벻á
+ ALTER TABLE Project_MasterDataAnalysis ADD BuYongBuShiYong int DEFAULT ((0));
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'벻á' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'BuYongBuShiYong'
+
+ --δ+ͣ+
+ ALTER TABLE Project_MasterDataAnalysis ADD WeiShangXian int DEFAULT ((0));
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'δ+ͣ+' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'WeiShangXian'
+
+ --ر깤/+
+ ALTER TABLE Project_MasterDataAnalysis ADD ShenQingGuanBi int DEFAULT ((0));
+ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ر깤/+' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataAnalysis', @level2type=N'COLUMN',@level2name=N'ShenQingGuanBi'
+
+END
+GO
+
+
+--ɾѹĿдԭ
+delete from Project_MasterDataUsage
+where pro_id in (select distinct MasterSysId from Base_Project)
+GO
+delete Project_MasterDataUsage
+where is_relate=1
+GO
+delete Project_MasterDataUsage
+where projectid is not null and projectid!=''
+GO
+update Project_MasterDataUsage set ReasonType='깤/' where ReasonType='깤'
+GO
+update Project_MasterDataUsage set ReasonType='ͣ' where ReasonType='ͣ'
+GO
+update Project_MasterDataUsage set ReasonType='' where ReasonType in ('ҵͳ','ڶ/ģС','')
+GO
+update Project_MasterDataUsage set ReasonType='' where ReasonType in ('','ԭ')
+GO
+
+
+
+ALTER VIEW [dbo].[View_Project_MasterDataAnalysis] AS
+WITH LastData AS (
+ SELECT ReportDate, MAX(DataDate) AS LatestDate
+ FROM dbo.Project_MasterDataAnalysis AS tba
+ GROUP BY tba.ReportDate
+),RankedData AS (
+ SELECT tbb.*
+ FROM dbo.Project_MasterDataAnalysis tbb
+ INNER JOIN LastData AS ld ON tbb.DataDate = ld.LatestDate
+)
+SELECT
+ rd.*
+FROM RankedData AS rd
+
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SUBQHSE_V2026-07-20-xiaj（历史预立项数据处理）(2).sql b/DataBase/版本日志/SUBQHSE_V2026-07-20-xiaj（历史预立项数据处理）(2).sql
new file mode 100644
index 0000000..a9e825d
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-07-20-xiaj（历史预立项数据处理）(2).sql
@@ -0,0 +1,9 @@
+
+
+--ʷԤݴ
+insert into DataGovernance_PreProjectApply
+select newid(),bp.UnitId,bu.UnitName,ProjectName,'Ԥ','C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0','JT','ʷԤݴ',GETDATE(),'C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0','JT','ʷԤݴ',GETDATE(),1
+from base_project as bp left join Base_Unit as bu on bu.UnitId=bp.UnitId
+where MasterSysId is null and isnull(isDelete,0)=0 and ProjectName not in (select ProjectName from DataGovernance_PreProjectApply)
+
+
diff --git a/DataBase/版本日志/SUBQHSE_V2026-07-30-xiaj（数据治理大屏）.sql b/DataBase/版本日志/SUBQHSE_V2026-07-30-xiaj（数据治理大屏）.sql
new file mode 100644
index 0000000..bfd1683
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-07-30-xiaj（数据治理大屏）.sql
@@ -0,0 +1,8 @@
+
+--˾ĿԤ
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '204ACA82-15B4-4C80-AE9F-ACF25CE12345')
+BEGIN
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'204ACA82-15B4-4C80-AE9F-ACF25CE12345', N'', N'ProjectData/DataGovernance.aspx', 81, 'C2297533-B7C0-441E-B29F-ADE87C6F8978', 'Menu_SysSet', 1,1, 1);
+END
+GO
\ No newline at end of file
diff --git a/DataBase/版本日志/SUBQHSE_V2026-08-01-xiaj（集团主数据项目表）.sql b/DataBase/版本日志/SUBQHSE_V2026-08-01-xiaj（集团主数据项目表）.sql
new file mode 100644
index 0000000..3bf1ebf
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-08-01-xiaj（集团主数据项目表）.sql
@@ -0,0 +1,56 @@
+
+--drop table ads_pms_pro_info_build
+--ݱads_pms_pro_info_build
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'ads_pms_pro_info_build') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[ads_pms_pro_info_build](
+ [pro_id] [varchar](32) NOT NULL,
+ [pro_code] [varchar](200) NULL,
+ [pro_name] [varchar](500) NULL,
+ [pro_short_name] [varchar](64) NULL,
+ [main_data_code] [text] NULL,
+ [org_id] [bigint] NULL,
+ [org_name] [varchar](100) NULL,
+ [pro_nature] [varchar](30) NULL,
+ [pro_nature_code] [varchar](30) NULL,
+ [pro_status] [varchar](30) NULL,
+ [pro_status_code] [varchar](30) NULL,
+ [start_date] [date] NULL,
+ [end_date] [date] NULL,
+ [address] [varchar](300) NULL,
+ [pro_add_type] [int] NULL,
+ [org_id2] [bigint] NULL,
+ [org_name2] [varchar](100) NULL,
+ [ori_amt_sum_vat_fc] [decimal](22, 6) NULL,
+ [amt_add_sum_vat_fc_local] [decimal](22, 6) NULL,
+ [con_mode_code] [varchar](30) NULL,
+ [con_mode_desc] [varchar](30) NULL
+ CONSTRAINT [PK_ads_pms_pro_info_build] PRIMARY KEY CLUSTERED
+(
+ [pro_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] TEXTIMAGE_ON [PRIMARY]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_id'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_code'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_name'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_short_name'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'main_data_code'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֯ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'org_id'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'org_name'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_nature'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿCODE' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_nature_code'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_status'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ״̬CODE' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_status_code'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'start_date'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'깤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'end_date'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϸַ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'address'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀڵ(12)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'pro_add_type'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֯ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'org_id2'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'org_name2'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ˰ԭʼ浵' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'ori_amt_sum_vat_fc'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬҺ˰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'amt_add_sum_vat_fc_local'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'аʽcode' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'con_mode_code'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'аʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build', @level2type=N'COLUMN',@level2name=N'con_mode_desc'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ڽĿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'ads_pms_pro_info_build'
+END
+GO
diff --git a/DataBase/版本日志/SUBQHSE_V2026-08-03-xiaj（集团主数据组织架构表）.sql b/DataBase/版本日志/SUBQHSE_V2026-08-03-xiaj（集团主数据组织架构表）.sql
new file mode 100644
index 0000000..0be7231
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-08-03-xiaj（集团主数据组织架构表）.sql
@@ -0,0 +1,106 @@
+
+
+--λ֯λCode
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Base_Unit' AND COLUMN_NAME = 'MasterAdOrgCode')
+BEGIN
+ --֯λCode
+ ALTER TABLE Base_Unit ADD MasterAdOrgCode nvarchar(200);
+ --֯λName
+ ALTER TABLE Base_Unit ADD MasterAdOrgName nvarchar(500);
+
+ EXEC sp_addextendedproperty 'MS_Description', N'֯λCode','SCHEMA', N'dbo','TABLE', N'Base_Unit','COLUMN', N'MasterAdOrgCode';
+ EXEC sp_addextendedproperty 'MS_Description', N'֯λName','SCHEMA', N'dbo','TABLE', N'Base_Unit','COLUMN', N'MasterAdOrgName';
+END
+GO
+
+
+--ܹ֯
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'CNCEC_MasterData_ad_org') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[CNCEC_MasterData_ad_org](
+ [SysId] [varchar](200) NOT NULL,
+ [Continent] [nvarchar](200) NULL,
+ [Zjm] [nvarchar](200) NULL,
+ [Shortname] [nvarchar](500) NULL,
+ [SeqNum] [nvarchar](200) NULL,
+ [IsEnable] [nvarchar](200) NULL,
+ [EndDate] [nvarchar](200) NULL,
+ [IndusSect] [nvarchar](200) NULL,
+ [MnStaffCode] [nvarchar](200) NULL,
+ [AdOrgStatus] [nvarchar](200) NULL,
+ [AdOrgLevel] [nvarchar](200) NULL,
+ [BusiScop] [nvarchar](1000) NULL,
+ [BlgGroup] [nvarchar](200) NULL,
+ [IndusType] [nvarchar](200) NULL,
+ [IsFore] [nvarchar](200) NULL,
+ [RegCapCcy] [nvarchar](200) NULL,
+ [LocAdd] [nvarchar](200) NULL,
+ [LocRegion] [nvarchar](200) NULL,
+ [RegAdd] [nvarchar](200) NULL,
+ [RegRegion] [nvarchar](200) NULL,
+ [RegCap] [nvarchar](200) NULL,
+ [IsCorp] [nvarchar](200) NULL,
+ [PAdOrgCode] [nvarchar](200) NULL,
+ [ExName] [nvarchar](200) NULL,
+ [BeginDate] [nvarchar](200) NULL,
+ [LglRepName] [nvarchar](200) NULL,
+ [SocCrCode] [nvarchar](200) NULL,
+ [OrgType] [nvarchar](200) NULL,
+ [InvFinOrgCode] [nvarchar](200) NULL,
+ [InvTaxOrgCode] [nvarchar](200) NULL,
+ [InvRepOrgCode] [nvarchar](200) NULL,
+ [AdOrgName] [nvarchar](500) NULL,
+ [AdOrgCode] [nvarchar](200) NULL,
+ [SysModifydate] [nvarchar](200) NULL,
+ [SysMender] [nvarchar](200) NULL,
+ [SysCreatedate] [nvarchar](200) NULL,
+ [SysCreator] [nvarchar](200) NULL,
+ [SysState] [int] NULL,
+ CONSTRAINT [PK_CNCEC_MasterData_ad_org] PRIMARY KEY CLUSTERED
+(
+ [SysId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SysId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'Continent'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'Zjm'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'Shortname'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SeqNum'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'IsEnable'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'EndDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'IndusSect'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'MnStaffCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'AdOrgStatus'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'AdOrgLevel'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'BusiScop'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'BlgGroup'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'IndusType'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'IsFore'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'RegCapCcy'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'LocAdd'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'LocRegion'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'RegAdd'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'RegRegion'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'RegCap'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'IsCorp'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'PAdOrgCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'ExName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'BeginDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'LglRepName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SocCrCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'OrgType'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'InvFinOrgCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'InvTaxOrgCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'InvRepOrgCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'AdOrgName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'AdOrgCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SysModifydate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SysMender'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SysCreatedate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SysCreator'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org', @level2type=N'COLUMN',@level2name=N'SysState'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܹ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'CNCEC_MasterData_ad_org'
+END
+GO
+
+
diff --git a/DataBase/版本日志/SUBQHSE_V2026-08-20-xiaj（三库业务收集表）.sql b/DataBase/版本日志/SUBQHSE_V2026-08-20-xiaj（三库业务收集表）.sql
new file mode 100644
index 0000000..eeffce4
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-08-20-xiaj（三库业务收集表）.sql
@@ -0,0 +1,793 @@
+
+/*
+
+
+DROP TABLE SANKU_REPORT_LOG
+
+DROP TABLE SANKU_ACCIDENT_RECORD;
+DROP TABLE SANKU_VIOLATION;
+DROP TABLE SANKU_HAZARD;
+DROP TABLE SANKU_SAFETY_REWARD;
+DROP TABLE SANKU_ADMIN_PENALTY;
+DROP TABLE SANKU_TRAINING;
+DROP TABLE SANKU_EXAMINATION;
+DROP TABLE SANKU_DANGEROUS_ENGINEERING;
+DROP TABLE SANKU_GRID_PATROL;
+
+*/
+
+
+--select * from SANKU_REPORT_LOG
+
+
+--ҵϱ¼SANKU_REPORT_LOG
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_REPORT_LOG') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_REPORT_LOG](
+ [LOG_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [OPTYPE] [varchar](50) NOT NULL,
+ [CONTENT] [varchar](200) NOT NULL,
+ [RESULT] [varchar](500) NOT NULL,
+ [DETAIL] [varchar](max) NOT NULL,
+ [OPERATOR] [varchar](50) NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ CONSTRAINT [PK_SANKU_REPORT_LOG] PRIMARY KEY CLUSTERED
+(
+ [LOG_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].[SANKU_REPORT_LOG] ADD CONSTRAINT [DF_SANKU_REPORT_LOG_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'־' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_REPORT_LOG', @level2type=N'COLUMN',@level2name=N'LOG_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱʽԶϱֶϱռ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_REPORT_LOG', @level2type=N'COLUMN',@level2name=N'OPTYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_REPORT_LOG', @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'SANKU_REPORT_LOG', @level2type=N'COLUMN',@level2name=N'RESULT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ˵' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_REPORT_LOG', @level2type=N'COLUMN',@level2name=N'DETAIL'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_REPORT_LOG', @level2type=N'COLUMN',@level2name=N'OPERATOR'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_REPORT_LOG', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵϱ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_REPORT_LOG'
+END
+GO
+
+--¹¼ҵֶ
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Accident_AccidentHandle' AND COLUMN_NAME = 'AccidentLevel')
+BEGIN
+ --¹ʵȼ
+ ALTER TABLE Accident_AccidentHandle ADD AccidentLevel varchar(10);
+ --¹
+ ALTER TABLE Accident_AccidentHandle ADD AccidentType varchar(20);
+ --¹ʵص
+ ALTER TABLE Accident_AccidentHandle ADD AccidentLocation varchar(300);
+ --Ӿʧ
+ ALTER TABLE Accident_AccidentHandle ADD IndirectMoneyLoss decimal(9,2);
+ --ҵ϶ţ϶
+ ALTER TABLE Accident_AccidentHandle ADD ContractingResponsibility varchar(200);
+ --λƣθλ
+ ALTER TABLE Accident_AccidentHandle ADD PositionName varchar(50);
+ --
+ ALTER TABLE Accident_AccidentHandle ADD ResponsibilityType varchar(10);
+ --˵
+ ALTER TABLE Accident_AccidentHandle ADD ResponsibilityDesc varchar(500);
+ --Ա
+ ALTER TABLE Accident_AccidentHandle ADD ResponsibleMan varchar(50);
+ --Ա
+ ALTER TABLE Accident_AccidentHandle ADD ResponsibleManName varchar(50);
+
+ EXEC sp_addextendedproperty 'MS_Description', N'¹ʵȼ','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'AccidentLevel';
+ EXEC sp_addextendedproperty 'MS_Description', N'¹','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'AccidentType';
+ EXEC sp_addextendedproperty 'MS_Description', N'¹ʵص','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'AccidentLocation';
+ EXEC sp_addextendedproperty 'MS_Description', N'Ӿʧ','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'IndirectMoneyLoss';
+ EXEC sp_addextendedproperty 'MS_Description', N'ҵ϶','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'ContractingResponsibility';
+ EXEC sp_addextendedproperty 'MS_Description', N'λ','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'PositionName';
+ EXEC sp_addextendedproperty 'MS_Description', N'','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'ResponsibilityType';
+ EXEC sp_addextendedproperty 'MS_Description', N'˵','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'ResponsibilityDesc';
+ EXEC sp_addextendedproperty 'MS_Description', N'Ա','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'ResponsibleMan';
+ EXEC sp_addextendedproperty 'MS_Description', N'Ա','SCHEMA', N'dbo','TABLE', N'Accident_AccidentHandle','COLUMN', N'ResponsibleManName';
+END
+GO
+
+--ҵռ¹¼SANKU_ACCIDENT_RECORD
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_ACCIDENT_RECORD') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_ACCIDENT_RECORD](
+ [ACCIDENT_RECORD_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [ACCIDENT_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [ACCIDENT_NAME] [varchar](200) NULL,
+ [ACCIDENT_TIME] [datetime] NULL,
+ [ACCIDENT_LEVEL] [varchar](20) NULL,
+ [ACCIDENT_TYPE] [varchar](50) NULL,
+ [ACCIDENT_LOCATION] [varchar](300) NULL,
+ [ACCIDENT_DESCRIPTION] [text] NULL,
+ [DEATH_COUNT] [int] NOT NULL,
+ [SERIOUS_INJURY_COUNT] [int] NOT NULL,
+ [MINOR_INJURY_COUNT] [int] NOT NULL,
+ [DIRECT_ECONOMIC_LOSS] [decimal](18, 2) NULL,
+ [INDIRECT_ECONOMIC_LOSS] [decimal](18, 2) NULL,
+ [CONTRACTING_RESPONSIBILITY] [varchar](200) NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](100) NOT NULL,
+ [POSITION_NAME] [varchar](50) NULL,
+ [RESPONSIBILITY_TYPE] [varchar](10) NULL,
+ [RESPONSIBILITY_DESC] [text] NULL,
+ [PERSONNEL_ID_NUMBER] [varchar](18) NULL,
+ [PERSONNEL_NAME] [varchar](50) NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_ACCIDENT_RECORD] PRIMARY KEY CLUSTERED
+(
+ [ACCIDENT_RECORD_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] TEXTIMAGE_ON [PRIMARY]
+ALTER TABLE [dbo].[SANKU_ACCIDENT_RECORD] ADD CONSTRAINT [DF_SANKU_AACCIDENT_RECORD_DEATH_COUNT] DEFAULT ((0)) FOR [DEATH_COUNT]
+ALTER TABLE [dbo].[SANKU_ACCIDENT_RECORD] ADD CONSTRAINT [DF_SANKU_AACCIDENT_RECORD_SERIOUS_INJURY_COUNT] DEFAULT ((0)) FOR [SERIOUS_INJURY_COUNT]
+ALTER TABLE [dbo].[SANKU_ACCIDENT_RECORD] ADD CONSTRAINT [DF_SANKU_AACCIDENT_RECORD_MINOR_INJURY_COUNT] DEFAULT ((0)) FOR [MINOR_INJURY_COUNT]
+ALTER TABLE [dbo].[SANKU_ACCIDENT_RECORD] ADD CONSTRAINT [DF_SANKU_AACCIDENT_RECORD_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_ACCIDENT_RECORD] ADD CONSTRAINT [DF_SANKU_AACCIDENT_RECORD_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹ʼ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹ʵȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_LEVEL'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹ʵص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_LOCATION'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'¹ʾ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ACCIDENT_DESCRIPTION'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'DEATH_COUNT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SERIOUS_INJURY_COUNT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'MINOR_INJURY_COUNT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֱӾʧԪ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'DIRECT_ECONOMIC_LOSS'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ӾʧԪ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'INDIRECT_ECONOMIC_LOSS'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ţ϶' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'CONTRACTING_RESPONSIBILITY'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'POSITION_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'RESPONSIBILITY_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˵' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'RESPONSIBILITY_DESC'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְԱ֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְԱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռ¹¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ACCIDENT_RECORD'
+END
+GO
+
+----ΥԱ¼˵ΪΥҵ
+--update Sys_Menu
+--set MenuName='Υҵ',IsUsed=1,MenuType='Menu_System_Hsse_P_Hsse'
+--where MenuId='06958288-96F4-4291-909A-FFC2FC76814D' and MenuType='Menu_Hsse'
+--GO
+
+--Υҵҵֶ
+IF NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ConstText = 'Υ·' AND GroupId = 'ViolationPersonHandleStep')
+BEGIN
+ INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) VALUES('B28541A9-6C13-4506-9E42-B081F6820CB9',3,'Υ·',3,'ViolationPersonHandleStep')
+ INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId) VALUES('A28541A9-6C13-4506-9E42-B081F6820CA9',4,'Աͣ',4,'ViolationPersonHandleStep')
+END
+GO
+
+--Υҵҵֶ
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Check_ViolationPerson' AND COLUMN_NAME = 'RectificationStatus')
+BEGIN
+ --״̬δ,,,
+ ALTER TABLE Check_ViolationPerson ADD RectificationStatus varchar(50);
+ --Υ¼һΥ£Υ£Υ
+ ALTER TABLE Check_ViolationPerson ADD ViolationLevel varchar(50);
+ EXEC sp_addextendedproperty 'MS_Description', N'״̬','SCHEMA', N'dbo','TABLE', N'Check_ViolationPerson','COLUMN', N'RectificationStatus';
+ EXEC sp_addextendedproperty 'MS_Description', N'Υ¼','SCHEMA', N'dbo','TABLE', N'Check_ViolationPerson','COLUMN', N'ViolationLevel';
+END
+GO
+
+--ʷΥҵ״̬Ϊ
+update Check_ViolationPerson set RectificationStatus='' where RectificationStatus is null
+GO
+
+--ʷΥ¼Ϊ
+update Check_ViolationPerson set ViolationLevel='һΥ' where ViolationLevel is null
+GO
+
+--ʷû
+update Check_ViolationPerson set CompileDate=DATEDIFF(DAY,1,ViolationDate) where CompileDate is null
+GO
+
+--ΥҵSANKU_VIOLATION
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_VIOLATION') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_VIOLATION](
+ [VIOLATION_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](100) NOT NULL,
+ [PERSONNEL_ID_NUMBER] [varchar](18) NULL,
+ [PERSONNEL_NAME] [varchar](100) NULL,
+ [VIOLATION_DATE] [date] NOT NULL,
+ [VIOLATION_TYPE] [varchar](50) NOT NULL,
+ [VIOLATION_CONTENT] [varchar](2000) NULL,
+ [PENALTY_RESULT] [varchar](500) NULL,
+ [RECTIFICATION_STATUS] [varchar](10) NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_VIOLATION] PRIMARY KEY CLUSTERED
+(
+ [VIOLATION_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].[SANKU_VIOLATION] ADD CONSTRAINT [DF_SANKU_VIOLATION_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_VIOLATION] ADD CONSTRAINT [DF_SANKU_VIOLATION_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Υҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'VIOLATION_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ΥԱ֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ΥԱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Υ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'VIOLATION_DATE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Υ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'VIOLATION_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Υ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'VIOLATION_CONTENT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'PENALTY_RESULT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'RECTIFICATION_STATUS'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռΥҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_VIOLATION'
+END
+GO
+
+--ȫͣSANKU_SAFETY_REWARD
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_SAFETY_REWARD') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_SAFETY_REWARD](
+ [REWARD_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [PERSONNEL_ID_NUMBER] [varchar](18) NOT NULL,
+ [PERSONNEL_NAME] [varchar](50) NOT NULL,
+ [REWARD_DATE] [date] NOT NULL,
+ [REWARD_TYPE] [varchar](10) NOT NULL,
+ [REWARD_UNIT_ID] [varchar](20) NULL,
+ [REWARD_UNIT_CODE] [varchar](18) NULL,
+ [REWARD_UNIT_NAME] [varchar](200) NULL,
+ [REWARD_CONTENT] [varchar](500) NULL,
+ [REWARD_AMOUNT] [decimal](18, 2) NULL,
+ [REWARD_LEVEL] [varchar](20) NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_SAFETY_REWARD] PRIMARY KEY CLUSTERED
+(
+ [REWARD_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].[SANKU_SAFETY_REWARD] ADD CONSTRAINT [DF_SANKU_SAFETY_REWARD_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_SAFETY_REWARD] ADD CONSTRAINT [DF_SANKU_SAFETY_REWARD_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʹ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_DATE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣ,' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_UNIT_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'͵λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_UNIT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'͵λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_UNIT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_CONTENT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͽԪΪΪ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_AMOUNT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'REWARD_LEVEL'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռȫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_SAFETY_REWARD'
+END
+GO
+
+--Check_AdminPenalty
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'Check_AdminPenalty') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[Check_AdminPenalty](
+ [PenaltyId] [varchar](50) NOT NULL,
+ [PenaltyCode] [varchar](50) NOT NULL,
+ [ProjectId] [varchar](50) NOT NULL,
+ [UnitId] [varchar](50) NOT NULL,
+ [UnitName] [varchar](200) NOT NULL,
+ [SysType] [char](1) NOT NULL,
+ [PenaltyDate] [datetime] NOT NULL,
+ [PenaltyType] [varchar](50) NOT NULL,
+ [PenaltyContent] [varchar](2000) NULL,
+ [PenaltyAmount] [decimal](18, 2) NULL,
+ [PenaltyAuthority] [varchar](200) NULL,
+ [PenaltyStatus] [varchar](10) NULL,
+ [CompileMan] [varchar](50) NOT NULL,
+ [CompileDate] [datetime] NOT NULL,
+ [Remark] [varchar](200) NULL,
+ CONSTRAINT [PK_Check_AdminPenalty] PRIMARY KEY CLUSTERED
+(
+ [PenaltyId] 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].[Check_AdminPenalty] ADD CONSTRAINT [DF_Check_AdminPenalty_CompileDate] DEFAULT (getdate()) FOR [CompileDate]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'ProjectId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'1ȫ2' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'SysType'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyType'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyContent'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ԫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyAmount'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyAuthority'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'PenaltyStatus'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Check_AdminPenalty', @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'Check_AdminPenalty', @level2type=N'COLUMN',@level2name=N'Remark'
+END
+GO
+
+--⣺SANKU_ADMIN_PENALTY
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_ADMIN_PENALTY') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_ADMIN_PENALTY](
+ [PENALTY_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](100) NOT NULL,
+ [PENALTY_DATE] [date] NOT NULL,
+ [PENALTY_TYPE] [varchar](50) NOT NULL,
+ [PENALTY_CONTENT] [varchar](2000) NULL,
+ [PENALTY_AMOUNT] [decimal](18, 2) NULL,
+ [PENALTY_AUTHORITY] [varchar](200) NULL,
+ [PENALTY_STATUS] [varchar](10) NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_ADMIN_PENALTY] PRIMARY KEY CLUSTERED
+(
+ [PENALTY_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].[SANKU_ADMIN_PENALTY] ADD CONSTRAINT [DF_SANKU_ADMIN_PENALTY_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_ADMIN_PENALTY] ADD CONSTRAINT [DF_SANKU_ADMIN_PENALTY_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PENALTY_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PENALTY_DATE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PENALTY_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PENALTY_CONTENT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ԫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PENALTY_AMOUNT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PENALTY_AUTHORITY'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'PENALTY_STATUS'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_ADMIN_PENALTY'
+END
+GO
+
+--update Technique_Rectify
+--set RectifyName=REPLACE(RectifyName, ' ', '')
+--where SupRectifyId='0'
+--GO
+
+
+--¼SANKU_HAZARD
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_HAZARD') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_HAZARD](
+ [HAZARD_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](200) NOT NULL,
+ [RESPONSIBLE_PERSONNEL_ID_NUMBER] [varchar](18) NULL,
+ [RESPONSIBLE_PERSONNEL_NAME] [varchar](50) NULL,
+ [RECTIFIER_PERSONNEL_ID_NUMBER] [varchar](18) NULL,
+ [RECTIFIER_PERSONNEL_NAME] [varchar](50) NULL,
+ [DISCOVERY_DATE] [date] NOT NULL,
+ [HAZARD_TYPE] [varchar](50) NOT NULL,
+ [HAZARD_LEVEL] [varchar](20) NOT NULL,
+ [HAZARD_CONTENT] [varchar](2000) NULL,
+ [RECTIFICATION_STATUS] [varchar](10) NULL,
+ [RECTIFICATION_DEADLINE_ID] [date] NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_HAZARD] PRIMARY KEY CLUSTERED
+(
+ [HAZARD_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].[SANKU_HAZARD] ADD CONSTRAINT [DF_SANKU_HAZARD_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_HAZARD] ADD CONSTRAINT [DF_SANKU_HAZARD_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'HAZARD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'RESPONSIBLE_PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'RESPONSIBLE_PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'RECTIFIER_PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'RECTIFIER_PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'DISCOVERY_DATE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'HAZARD_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'HAZARD_LEVEL'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'HAZARD_CONTENT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'RECTIFICATION_STATUS'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_HAZARD'
+END
+GO
+
+--ѵSANKU_TRAINING
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_TRAINING') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_TRAINING](
+ [TRAINING_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](100) NOT NULL,
+ [PERSONNEL_ID_NUMBER] [varchar](18) NOT NULL,
+ [PERSONNEL_NAME] [varchar](50) NOT NULL,
+ [TRAINING_DATE] [date] NOT NULL,
+ [TRAINING_NAME] [varchar](200) NOT NULL,
+ [TRAINING_TYPE] [varchar](50) NULL,
+ [TRAINING_DURATION] [decimal](6, 1) NULL,
+ [TRAINING_ORGANIZER] [varchar](200) NULL,
+ [TRAINING_CONTENT] [varchar](2000) NULL,
+ [TRAINING_RESULT] [varchar](10) NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_TRAINING] PRIMARY KEY CLUSTERED
+(
+ [TRAINING_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].[SANKU_TRAINING] ADD CONSTRAINT [DF_SANKU_TRAINING_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_TRAINING] ADD CONSTRAINT [DF_SANKU_TRAINING_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵϸID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_DATE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵʱѧʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_DURATION'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_ORGANIZER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_CONTENT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵͨ,δͨ,ȱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'TRAINING_RESULT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_TRAINING'
+END
+GO
+
+--ԿˣSANKU_EXAMINATION
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_EXAMINATION') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_EXAMINATION](
+ [EXAMINATION_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](100) NOT NULL,
+ [PERSONNEL_ID_NUMBER] [varchar](18) NOT NULL,
+ [PERSONNEL_NAME] [varchar](50) NOT NULL,
+ [EXAM_DATE] [date] NOT NULL,
+ [EXAM_NAME] [varchar](200) NOT NULL,
+ [EXAM_TYPE] [varchar](50) NULL,
+ [EXAM_SCORE] [decimal](6, 1) NULL,
+ [EXAM_RESULT] [nvarchar](10) NULL,
+ [EXAM_ORGANIZER] [varchar](200) NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_EXAMINATION] PRIMARY KEY CLUSTERED
+(
+ [EXAMINATION_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].[SANKU_EXAMINATION] ADD CONSTRAINT [DF_SANKU_EXAMINATION_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_EXAMINATION] ADD CONSTRAINT [DF_SANKU_EXAMINATION_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˴' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'EXAMINATION_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'EXAM_DATE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'EXAM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'EXAM_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˳ɼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'EXAM_SCORE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˽˽' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'EXAM_RESULT'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˵λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'EXAM_ORGANIZER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռԿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_EXAMINATION'
+END
+GO
+
+--Σ̣ҵֶ
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Solution_LargerHazard' AND COLUMN_NAME = 'StandbyPersonnelId')
+BEGIN
+ --ʩλ
+ ALTER TABLE Solution_LargerHazard ADD UnitId nvarchar(50);
+ --վԱ
+ ALTER TABLE Solution_LargerHazard ADD StandbyPersonnelId nvarchar(50);
+
+ EXEC sp_addextendedproperty 'MS_Description', N'ʩλId','SCHEMA', N'dbo','TABLE', N'Solution_LargerHazard','COLUMN', N'UnitId';
+ EXEC sp_addextendedproperty 'MS_Description', N'վԱId','SCHEMA', N'dbo','TABLE', N'Solution_LargerHazard','COLUMN', N'StandbyPersonnelId';
+END
+GO
+
+
+--ҵռΣ̣SANKU_DANGEROUS_ENGINEERING
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_DANGEROUS_ENGINEERING') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_DANGEROUS_ENGINEERING](
+ [DANGEROUS_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NOT NULL,
+ [PROJECT_NAME] [varchar](200) NOT NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](100) NOT NULL,
+ [ENGINEERING_DATE] [date] NOT NULL,
+ [ENGINEERING_NAME] [varchar](200) NOT NULL,
+ [ENGINEERING_TYPE] [varchar](200) NOT NULL,
+ [ENGINEERING_ADDRESS] [varchar](200) NULL,
+ [ENGINEERING_DESC] [varchar](2000) NULL,
+ [STANDBY_PERSONNEL_ID_NUMBER] [varchar](18) NOT NULL,
+ [STANDBY_PERSONNEL_NAME] [varchar](50) NOT NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](100) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](50) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [nvarchar](50) NULL,
+ [UnitName] [nvarchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_DANGEROUS_ENGINEERING] PRIMARY KEY CLUSTERED
+(
+ [DANGEROUS_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].[SANKU_DANGEROUS_ENGINEERING] ADD CONSTRAINT [DF_SANKU_DANGEROUS_ENGINEERING_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_DANGEROUS_ENGINEERING] ADD CONSTRAINT [DF_SANKU_DANGEROUS_ENGINEERING_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Σ̴' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'DANGEROUS_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Σ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'ENGINEERING_DATE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Σ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'ENGINEERING_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Σ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'ENGINEERING_TYPE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'ENGINEERING_ADDRESS'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'ENGINEERING_DESC'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'վԱ֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'STANDBY_PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'վԱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'STANDBY_PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'UPDATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'CREATE_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING', @level2type=N'COLUMN',@level2name=N'ReportDate'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵռΣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_DANGEROUS_ENGINEERING'
+END
+GO
+
+
+
+--ĿԱǷԱ
+IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_ProjectUser' AND COLUMN_NAME = 'IsGridWorker')
+BEGIN
+ --ǷԱǣǡ
+ ALTER TABLE Project_ProjectUser ADD IsGridWorker bit;
+ EXEC sp_addextendedproperty 'MS_Description', N'ǷԱ','SCHEMA', N'dbo','TABLE', N'Project_ProjectUser','COLUMN', N'IsGridWorker';
+END
+GO
+--ʷĿûΪԱ
+UPDATE Project_ProjectUser SET IsGridWorker=1 WHERE IsGridWorker IS NULL
+GO
+
+
+--Ѳ飨SANKU_GRID_PATROL
+IF NOT EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'SANKU_GRID_PATROL') AND type = N'U')
+BEGIN
+CREATE TABLE [dbo].[SANKU_GRID_PATROL](
+ [PATROL_ID] [bigint] IDENTITY(1,1) NOT NULL,
+ [RECORD_ID] [varchar](50) NOT NULL,
+ [PROJECT_CODE] [varchar](50) NULL,
+ [PROJECT_NAME] [varchar](200) NULL,
+ [SUBCONTRACTOR_ID] [varchar](20) NULL,
+ [SUBCONTRACTOR_CODE] [varchar](18) NULL,
+ [SUBCONTRACTOR_NAME] [varchar](200) NULL,
+ [PERSONNEL_ID_NUMBER] [varchar](18) NOT NULL,
+ [PERSONNEL_NAME] [varchar](50) NOT NULL,
+ [PATROL_TIME] [datetime] NOT NULL,
+ [PATROL_STATUS] [varchar](50) NULL,
+ [SOURCE_SYSTEM_ID] [varchar](50) NULL,
+ [SOURCE_SYSTEM_NAME] [varchar](50) NULL,
+ [SUBMITTER_ID_NUMBER] [varchar](18) NULL,
+ [SUBMITTER_NAME] [varchar](50) NULL,
+ [UPDATE_TIME] [datetime] NOT NULL,
+ [CREATE_TIME] [datetime] NOT NULL,
+ [CollCropCode] [varchar](20) NULL,
+ [UnitId] [varchar](50) NULL,
+ [UnitName] [varchar](50) NULL,
+ [ReportDate] [datetime] NULL,
+ CONSTRAINT [PK_SANKU_GRID_PATROL] PRIMARY KEY CLUSTERED
+(
+ [PATROL_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].[SANKU_GRID_PATROL] ADD CONSTRAINT [DF_SANKU_GRID_PATROL_UPDATE_TIME] DEFAULT (getdate()) FOR [UPDATE_TIME]
+ALTER TABLE [dbo].[SANKU_GRID_PATROL] ADD CONSTRAINT [DF_SANKU_GRID_PATROL_CREATE_TIME] DEFAULT (getdate()) FOR [CREATE_TIME]
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'PATROL_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'RECORD_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'PROJECT_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'PROJECT_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ֯' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_CODE'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'SUBCONTRACTOR_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'PERSONNEL_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ա' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'PERSONNEL_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ѳʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'PATROL_TIME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ѳɡδɣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'PATROL_STATUS'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴϵͳID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_ID'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դϵͳ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'SOURCE_SYSTEM_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'SUBMITTER_ID_NUMBER'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'SUBMITTER_NAME'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դλͳһô' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'CollCropCode'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԴλId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'UnitId'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Դλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'UnitName'
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SANKU_GRID_PATROL', @level2type=N'COLUMN',@level2name=N'ReportDate'
+END
+GO
+
+
diff --git a/DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql b/DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql
new file mode 100644
index 0000000..3e66bd7
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-08-21-xiaj（三库菜单）.sql
@@ -0,0 +1,125 @@
+/*
+˾⽨裺ݶưʵʲ˵λ滻
+ڹ˾ϵͳáλͬ
+廷ڹ˾ϵͳáλͬ
+MenuTypeݶưʵʲ˵λ滻
+
+SELECT MenuType,SortIndex+1,* FROM Sys_Menu WHERE MenuName='λ'
+
+*/
+--˾֯
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '9A65594E-1FB8-4961-89F3-123C34243210')
+BEGIN
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'9A65594E-1FB8-4961-89F3-123C34243210', N'֯', 'SysManage/MasterOrg.aspx', 12, N'C2297533-B7C0-441E-B29F-ADE87C6F8978', 'Menu_SysSet', 1,1, 1);
+END
+GO
+
+
+/*
+MenuTypeݶưʵʲ˵λ滻
+
+select MenuType, * from Sys_Menu
+where MenuName like '%Υ%' or MenuId='06958288-96F4-4291-909A-FFC2FC76814D'
+
+*/
+
+--ΥԱ¼˵ΪΥҵ
+update Sys_Menu set MenuName='Υҵ',IsUsed=1,MenuType='Menu_HSSE'
+where MenuId='06958288-96F4-4291-909A-FFC2FC76814D'
+GO
+
+
+delete Sys_Menu WHERE MenuId = '004EE400-0000-0000-0000-E2EF9AFA6F8D' or SuperMenu='004EE400-0000-0000-0000-E2EF9AFA6F8D'
+
+GO
+
+/*
+˾⽨裺ݶưʵʲ˵λ滻
+ڹ˾ݹĿݷͬ
+廷ڹ˾ۺϹŶͬ
+
+SELECT MenuType,SortIndex+1,* FROM Sys_Menu WHERE MenuName='Ŷ' and MenuId='8B9C0F42-D36F-4798-94AB-F56723E8B714'
+*/
+
+
+--˾⽨
+IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '004EE400-0000-0000-0000-E2EF9AFA6F8D')
+BEGIN
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0000-E2EF9AFA6F8D', N'⽨', '', 62, N'0', 'Menu_SJTB', 1,0, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0000-E2EF9AFA0000', N'־', 'SanKu/ReportLog.aspx', 01, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB', 1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0000-E2EF9AFA1000', N'У', 'SanKu/DataValidation.aspx', 02, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB', 1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0001', N'Σ', 'SanKu/DangerousEngineering.aspx', 10, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0002', N'¼', 'SanKu/Hazard.aspx', 20, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0003', N'ѵ', 'SanKu/Training.aspx', 30, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0004', N'Կ', 'SanKu/Examination.aspx', 40, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0005', N'¹¼', 'SanKu/AccidentRecord.aspx', 50, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB', 1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0006', N'Υҵ', 'SanKu/VioLation.aspx', 60, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0007', N'ȫ', 'SanKu/SafetyReward.aspx', 70, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+ --INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ --VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0008', N'', 'SanKu/AdminPenalty.aspx', 80, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+ INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+ VALUES (N'004EE400-0000-0000-0001-E2EF9AFA0009', N'Ѳ', 'SanKu/GridPatrol.aspx', 90, N'004EE400-0000-0000-0000-E2EF9AFA6F8D', 'Menu_SJTB',1,1, 1);
+END
+GO
+
+
+
+
+
+
+
+----
+--IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111')
+--BEGIN
+-- --ȫ
+-- INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+-- VALUES (N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111', N'', 'CQMS/Check/AdminPenalty.aspx?type=1', 20, N'012DF857-AD6B-49AA-87A8-030CD5F66D4C', N'Menu_System_Hsse_P_Hsse', 0,1, 1);
+-- INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+-- VALUES (N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111', N'', 'CQMS/Check/AdminPenalty.aspx?type=1', 20, N'ED638B26-C462-4971-ACC8-BF6BA9668FB2', N'Menu_System_Hsse_S_Hsse', 0,1, 1);
+-- --
+-- INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+-- VALUES (N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD112', N'', 'CQMS/Check/AdminPenalty.aspx?type=2', 95, N'A54EC449-5F77-4068-83B9-AA305B721A0B', N'Menu_System_Qwms_P_Cqms', 0,1, 1);
+-- INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed)
+-- VALUES (N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD112', N'', 'CQMS/Check/AdminPenalty.aspx?type=2', 95, N'BC216C7E-E703-4719-BE96-DDDB8CC30592', N'Menu_System_Qwms_S_Cqms', 0,1, 1);
+--END
+--GO
+----ȫť
+--IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111')
+--BEGIN
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0001', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111', N'', 1);
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0002', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111', N'', 2);
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0003', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111', N'ɾ', 3);
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0004', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111', N'', 4);
+--END
+--GO
+----ť
+--IF NOT EXISTS (SELECT * FROM Sys_ButtonToMenu WHERE MenuId = '67EE8A9B-2C49-47ED-B4A1-DCC90A4AD112')
+--BEGIN
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0201', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD112', N'', 1);
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0202', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD112', N'', 2);
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0203', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD112', N'ɾ', 3);
+-- INSERT INTO [dbo].[Sys_ButtonToMenu] ([ButtonToMenuId], [MenuId], [ButtonName], [SortIndex])
+-- VALUES (N'318DC2E1-F119-4166-B764-7EDC07FB0204', N'67EE8A9B-2C49-47ED-B4A1-DCC90A4AD112', N'', 4);
+--END
+--GO
+
+
+
diff --git a/DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql b/DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql
new file mode 100644
index 0000000..a6473d2
--- /dev/null
+++ b/DataBase/版本日志/SUBQHSE_V2026-09-07-xiaj（SP_SANKU_DATA_INIT）.sql
@@ -0,0 +1,270 @@
+
+CREATE OR ALTER PROCEDURE [dbo].[SP_SANKU_DATA_INIT]
+ @type VARCHAR(100) = NULL,
+ @op TINYINT
+AS
+BEGIN
+ SET NOCOUNT ON;
+ DECLARE @trimType VARCHAR(100) = LTRIM(RTRIM(ISNULL(@type, '')));
+
+ -- op=0
+ IF @op = 0
+ BEGIN
+ IF @trimType = 'SANKU_ACCIDENT_RECORD'
+ BEGIN
+ TRUNCATE TABLE SANKU_ACCIDENT_RECORD;
+ END
+ ELSE IF @trimType = 'SANKU_VIOLATION'
+ BEGIN
+ TRUNCATE TABLE SANKU_VIOLATION;
+ END
+ ELSE IF @trimType = 'SANKU_HAZARD'
+ BEGIN
+ TRUNCATE TABLE SANKU_HAZARD;
+ END
+ ELSE IF @trimType = 'SANKU_SAFETY_REWARD'
+ BEGIN
+ TRUNCATE TABLE SANKU_SAFETY_REWARD;
+ END
+ ELSE IF @trimType = 'SANKU_ADMIN_PENALTY'
+ BEGIN
+ TRUNCATE TABLE SANKU_ADMIN_PENALTY;
+ END
+ ELSE IF @trimType = 'SANKU_TRAINING'
+ BEGIN
+ TRUNCATE TABLE SANKU_TRAINING;
+ END
+ ELSE IF @trimType = 'SANKU_EXAMINATION'
+ BEGIN
+ TRUNCATE TABLE SANKU_EXAMINATION;
+ END
+ ELSE IF @trimType = 'SANKU_DANGEROUS_ENGINEERING'
+ BEGIN
+ TRUNCATE TABLE SANKU_DANGEROUS_ENGINEERING;
+ END
+ ELSE IF @trimType = 'SANKU_GRID_PATROL'
+ BEGIN
+ TRUNCATE TABLE SANKU_GRID_PATROL;
+ END
+ ELSE IF @trimType = '' -- type null/գȫ
+ BEGIN
+ TRUNCATE TABLE SANKU_ACCIDENT_RECORD;
+ TRUNCATE TABLE SANKU_VIOLATION;
+ TRUNCATE TABLE SANKU_HAZARD;
+ TRUNCATE TABLE SANKU_SAFETY_REWARD;
+ TRUNCATE TABLE SANKU_ADMIN_PENALTY;
+ TRUNCATE TABLE SANKU_TRAINING;
+ TRUNCATE TABLE SANKU_EXAMINATION;
+ TRUNCATE TABLE SANKU_DANGEROUS_ENGINEERING;
+ TRUNCATE TABLE SANKU_GRID_PATROL;
+ END
+ END
+
+ -- op=1 ʼ
+ IF @op = 1
+ BEGIN
+
+ -- typeΪNULL/ַгʼűִУtypeִ֧
+ IF @type = 'SANKU_ACCIDENT_RECORD' OR @trimType = ''
+ BEGIN
+ --¹¼ݳʼ
+ INSERT INTO SANKU_ACCIDENT_RECORD(ACCIDENT_ID,PROJECT_CODE,PROJECT_NAME,ACCIDENT_NAME,ACCIDENT_TIME,ACCIDENT_LEVEL,ACCIDENT_TYPE,ACCIDENT_LOCATION,ACCIDENT_DESCRIPTION,DEATH_COUNT,SERIOUS_INJURY_COUNT,MINOR_INJURY_COUNT
+ ,DIRECT_ECONOMIC_LOSS,INDIRECT_ECONOMIC_LOSS,CONTRACTING_RESPONSIBILITY,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,POSITION_NAME,RESPONSIBILITY_TYPE,RESPONSIBILITY_DESC,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT tba.AccidentHandleId,pms.pro_code,pms.pro_name,tba.AccidentHandleName,tba.AccidentDate,tba.AccidentLevel,tba.AccidentType,tba.AccidentLocation,tba.AccidentDef,tba.DeathPersonNum,tba.InjuriesPersonNum,tba.MinorInjuriesPersonNum
+ ,tba.MoneyLoss,tba.IndirectMoneyLoss,tba.ContractingResponsibility
+ ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,tba.PositionName,tba.ResponsibilityType,tba.ResponsibilityDesc,su.IdentityCard,tba.ResponsibleManName,suc.IdentityCard,suc.UserName,tba.CompileDate,tba.CompileDate
+ FROM Accident_AccidentHandle AS tba WITH(NOLOCK)
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN Sys_User AS su WITH(NOLOCK) ON su.UserId = tba.ResponsibleMan
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CompileMan
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.AccidentDate>='2026-01-01'
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(su.IdentityCard)=18
+ AND tba.AccidentHandleId NOT IN (SELECT ACCIDENT_ID FROM SANKU_ACCIDENT_RECORD WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_VIOLATION' OR @trimType = ''
+ BEGIN
+ --Υҵݳʼ
+ INSERT INTO SANKU_VIOLATION(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,VIOLATION_DATE,VIOLATION_TYPE,VIOLATION_CONTENT,PENALTY_RESULT,RECTIFICATION_STATUS,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT tba.ViolationPersonId,pms.pro_code,pms.pro_name
+ ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,spp.IdentityCard,spp.PersonName,tba.ViolationDate,tba.ViolationLevel,tba.ViolationDef,vphs.ConstText,tba.RectificationStatus,suc.IdentityCard,suc.UserName,tba.CompileDate,tba.CompileDate
+ FROM Check_ViolationPerson AS tba WITH(NOLOCK)
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN Sys_Const AS vphs WITH(NOLOCK) ON vphs.ConstValue = tba.HandleStep AND vphs.GroupId='ViolationPersonHandleStep'
+ LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.PersonId AND LEN(spp.IdentityCard)=18
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CompileMan
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.ViolationDate>='2026-01-01'
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18
+ AND tba.ViolationPersonId NOT IN (SELECT RECORD_ID FROM SANKU_VIOLATION WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_SAFETY_REWARD' OR @trimType = ''
+ BEGIN
+ --ȫݳʼ
+ INSERT INTO SANKU_SAFETY_REWARD(RECORD_ID,PROJECT_CODE,PROJECT_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,REWARD_DATE,REWARD_UNIT_ID,REWARD_UNIT_CODE,REWARD_UNIT_NAME,REWARD_TYPE,REWARD_CONTENT,REWARD_AMOUNT,REWARD_LEVEL,SUBMITTER_ID_NUMBER,SUBMITTER_NAME)
+ SELECT tba.RewardAndPunishID,pms.pro_code,pms.pro_name,spp.IdentityCard,spp.PersonName,tba.Date
+ ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,(CASE tba.Type WHEN 1 THEN '' WHEN 2 THEN '' ELSE '' END) AS TYPE,tba.Description
+ ,(CASE WHEN tba.Type = 1 THEN ABS(tba.Money) WHEN tba.Type = 2 THEN -ABS(tba.Money) ELSE tba.Money END) AS Money
+ ,(CASE tba.Type
+ WHEN 1 THEN (SELECT ConstText FROM Sys_Const WHERE GroupId='RewardType' AND ConstValue=tba.RewardAndPunishType)
+ WHEN 2 THEN (SELECT ConstText FROM Sys_Const WHERE GroupId='PunishType' AND ConstValue=tba.RewardAndPunishType) END) AS TYPE
+ ,suc.IdentityCard,suc.UserName
+ FROM Check_RewardAndPunish AS tba WITH(NOLOCK)
+ LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.RewardAndPunishMan --AND LEN(spp.IdentityCard)=18
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.ResponseUnit --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CreateMan
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.Date>='2026-01-01' AND tba.Type IN (1,2)
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(spp.IdentityCard)=18 AND LEN(suc.IdentityCard)=18
+ AND tba.RewardAndPunishID NOT IN (SELECT RECORD_ID FROM SANKU_SAFETY_REWARD WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_SAFETY_REWARD' OR @trimType = ''
+ BEGIN
+ --ݳʼ
+ INSERT INTO SANKU_ADMIN_PENALTY(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PENALTY_DATE,PENALTY_TYPE,PENALTY_CONTENT,PENALTY_AMOUNT,PENALTY_AUTHORITY,PENALTY_STATUS,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT tba.PenaltyId,pms.pro_code,pms.pro_name
+ ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,tba.PenaltyDate,tba.PenaltyType,tba.PenaltyContent,tba.PenaltyAmount,tba.PenaltyAuthority,tba.PenaltyStatus
+ ,suc.IdentityCard,suc.UserName,tba.PenaltyDate,tba.PenaltyDate
+ FROM Check_AdminPenalty AS tba WITH(NOLOCK)
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.CompileMan
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.PenaltyDate>='2026-01-01'
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18
+ AND tba.PenaltyId NOT IN (SELECT RECORD_ID FROM SANKU_ADMIN_PENALTY WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_HAZARD' OR @trimType = ''
+ BEGIN
+ --¼ݳʼ
+ INSERT INTO SANKU_HAZARD(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,RESPONSIBLE_PERSONNEL_ID_NUMBER,RESPONSIBLE_PERSONNEL_NAME,RECTIFIER_PERSONNEL_ID_NUMBER,RECTIFIER_PERSONNEL_NAME
+ ,DISCOVERY_DATE,HAZARD_TYPE,HAZARD_LEVEL,HAZARD_CONTENT,RECTIFICATION_STATUS,RECTIFICATION_DEADLINE_ID,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT tba.RectifyNoticesItemId,pms.pro_code,pms.pro_name
+ ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,suzg.IdentityCard,suzg.UserName,suzg.IdentityCard,suzg.UserName,tbb.CheckedDate,rectify.RectifyName
+ ,(CASE tbb.HiddenHazardType WHEN 1 THEN 'һ' WHEN 2 THEN 'ϴ' WHEN 3 THEN 'ش' ELSE 'һ' END) AS TYPE,tba.WrongContent
+ ,(CASE WHEN tbb.States = 2 THEN 'δ' WHEN tbb.States = 3 THEN '' WHEN States = 4 THEN '' WHEN States = 5 THEN '' ELSE 'δ' END) AS StatesName
+ ,tba.LimitTime,suc.IdentityCard,suc.UserName,tbb.CheckedDate,tbb.CheckedDate
+ FROM Check_RectifyNoticesItem AS tba WITH(NOLOCK)
+ LEFT JOIN Check_RectifyNotices AS tbb WITH(NOLOCK) ON tbb.RectifyNoticesId = tba.RectifyNoticesId
+ --LEFT JOIN Check_RectifyNoticesFlowOperate AS tbc WITH(NOLOCK) ON tbc.RectifyNoticesId = tba.RectifyNoticesId
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tbb.UnitId --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tbb.DutyPersonId
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.CompleteManId
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ LEFT JOIN Technique_Rectify AS rectify WITH(NOLOCK) ON tba.RectifyId = rectify.RectifyId
+ WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tbb.CheckedDate>='2026-01-01' AND tbb.States > 1
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suc.IdentityCard)=18 AND LEN(suzg.IdentityCard)=18 AND rectify.RectifyName IS NOT NULL
+ AND tba.RectifyNoticesItemId NOT IN (SELECT RECORD_ID FROM SANKU_HAZARD WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_TRAINING' OR @trimType = ''
+ BEGIN
+ --ѵݳʼ
+ INSERT INTO SANKU_TRAINING(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,TRAINING_DATE,TRAINING_NAME,TRAINING_TYPE,TRAINING_DURATION,TRAINING_ORGANIZER,TRAINING_CONTENT,TRAINING_RESULT,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT tba.TrainDetailId,pms.pro_code,pms.pro_name
+ ,spu.MasterAdOrgCode,spu.CollCropCode,CASE WHEN spu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(spu.MasterAdOrgCode)) = '' THEN spu.UnitName ELSE spu.MasterAdOrgName END AS UnitName
+ ,spp.IdentityCard,spp.PersonName,tbb.TrainStartDate
+ ,(CASE WHEN ISNULL(tbb.TrainTitle,'')='' THEN bty.TrainTypeName ELSE tbb.TrainTitle END) AS TrainName
+ ,bty.TrainTypeName,tbb.TeachHour,bu.UnitName
+ ,(CASE WHEN ISNULL(tbb.TrainContent,'')='' THEN bty.TrainTypeName ELSE tbb.TrainContent END) AS TrainContent
+ ,(CASE WHEN tba.CheckResult = 1 THEN 'ͨ' WHEN tba.CheckResult = 0 THEN 'δͨ' ELSE 'ȱ' END) AS CheckResult
+ ,suc.IdentityCard,suc.UserName,tbb.TrainStartDate,tbb.TrainStartDate
+ FROM EduTrain_TrainRecordDetail AS tba WITH(NOLOCK)
+ LEFT JOIN EduTrain_TrainRecord AS tbb WITH(NOLOCK) ON tbb.TrainingId = tba.TrainingId
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tbb.UnitIds --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.PersonId
+ LEFT JOIN Base_Unit AS spu WITH(NOLOCK) ON spu.UnitId = spp.UnitId --AND LEN(spu.CollCropCode)=18
+ LEFT JOIN Base_TrainType AS bty WITH(NOLOCK) ON bty.TrainTypeId = tbb.TrainTypeId
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.CompileMan
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ WHERE tbb.TrainStartDate>='2026-01-01' AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18
+ AND (spu.MasterAdOrgCode IS NOT NULL OR LEN(spu.CollCropCode)=18) AND bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL
+ AND tba.TrainDetailId NOT IN (SELECT RECORD_ID FROM SANKU_TRAINING WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_EXAMINATION' OR @trimType = ''
+ BEGIN
+ --Կݳʼ
+ INSERT INTO SANKU_EXAMINATION(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,EXAM_DATE,EXAM_NAME,EXAM_TYPE,EXAM_SCORE,EXAM_RESULT,EXAM_ORGANIZER,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT tba.TestRecordId,pms.pro_code,pms.pro_name
+ ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,spp.IdentityCard,spp.PersonName,tbb.TestEndTime,tbb.PlanName,'ۿ',tba.TestScores
+ ,(CASE WHEN tba.TestScores = 0 THEN 'ȱ' WHEN tba.TestScores >=80 THEN 'ͨ' WHEN tba.TestScores < 80 THEN 'δͨ' ELSE 'ȱ' END) AS CheckResult,tbb.UnitNames
+ ,suc.IdentityCard,suc.UserName,tbb.TestEndTime,tbb.TestEndTime
+ FROM Training_TestRecord AS tba WITH(NOLOCK)
+ LEFT JOIN Training_TestPlan AS tbb WITH(NOLOCK) ON tbb.TestPlanId = tba.TestPlanId
+ LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.TestManId
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = spp.UnitId --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tbb.PlanManId
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tbb.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ WHERE tbb.TestEndTime>='2026-01-01' AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL
+ AND tba.TestRecordId NOT IN (SELECT RECORD_ID FROM SANKU_EXAMINATION WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_DANGEROUS_ENGINEERING' OR @trimType = ''
+ BEGIN
+ --Σݳʼ
+ INSERT INTO SANKU_DANGEROUS_ENGINEERING(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,ENGINEERING_DATE,ENGINEERING_NAME,ENGINEERING_TYPE,ENGINEERING_ADDRESS,ENGINEERING_DESC,STANDBY_PERSONNEL_ID_NUMBER,STANDBY_PERSONNEL_NAME,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT tba.HazardId,pms.pro_code,pms.pro_name
+ ,bu.MasterAdOrgCode,bu.CollCropCode,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,ISNULL(tba.ExpectedTime,GETDATE()) AS ExpectedTime,tba.HazardName,sc.ConstText,tba.Address,tba.Descriptions,spp.IdentityCard,spp.PersonName,suc.IdentityCard,suc.UserName,tba.RecordTime,tba.RecordTime
+ FROM Solution_LargerHazard AS tba WITH(NOLOCK)
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = tba.UnitId --AND LEN(bu.CollCropCode)=18
+ LEFT JOIN SitePerson_Person AS spp WITH(NOLOCK) ON spp.PersonId = tba.StandbyPersonnelId
+ LEFT JOIN Sys_Const AS sc WITH(NOLOCK) ON sc.GroupId='LargerHazardType' AND sc.ConstValue= tba.HazardType
+ LEFT JOIN Sys_User AS suc WITH(NOLOCK) ON suc.UserId = tba.RecardMan
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ WHERE tba.RecordTime>='2026-01-01' AND LEN(suc.IdentityCard)=18 AND LEN(spp.IdentityCard)=18
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL
+ AND tba.HazardId NOT IN (SELECT RECORD_ID FROM SANKU_DANGEROUS_ENGINEERING WITH(NOLOCK));
+ END
+
+ IF @type = 'SANKU_GRID_PATROL' OR @trimType = ''
+ BEGIN
+ --Ѳ¼ݳʼ
+ WITH temp_data AS (
+ SELECT
+ tba.HazardRegisterId,pms.pro_code,pms.pro_name,bu.MasterAdOrgCode,bu.CollCropCode
+ ,CASE WHEN bu.MasterAdOrgCode IS NULL OR LTRIM(RTRIM(bu.MasterAdOrgCode)) = '' THEN bu.UnitName ELSE bu.MasterAdOrgName END AS UnitName
+ ,suzg.IdentityCard AS pNumber,suzg.UserName AS pUser,tba.CheckTime,'' AS StatusStr,suzg.IdentityCard,suzg.UserName,tba.CheckTime AS UpdateTime,tba.CheckTime AS CreateTime,
+ ROW_NUMBER() OVER (
+ PARTITION BY tba.CheckManId, CAST(tba.CheckTime AS DATE)
+ ORDER BY tba.CheckTime ASC
+ ) AS rn
+ FROM HSSE_Hazard_HazardRegister AS tba WITH(NOLOCK)
+ LEFT JOIN Base_Project AS bp WITH(NOLOCK) ON bp.ProjectId = tba.ProjectId
+ LEFT JOIN ads_pms_pro_info_build AS pms WITH(NOLOCK) ON pms.pro_id = bp.MasterSysId
+ LEFT JOIN Sys_User AS suzg WITH(NOLOCK) ON suzg.UserId = tba.CheckManId
+ LEFT JOIN Base_Unit AS bu WITH(NOLOCK) ON bu.UnitId = suzg.UnitId --AND LEN(bu.CollCropCode)=18
+ WHERE bp.MasterSysId IS NOT NULL AND pms.pro_code IS NOT NULL AND tba.CheckTime>='2026-01-01'
+ AND (bu.MasterAdOrgCode IS NOT NULL OR LEN(bu.CollCropCode)=18) AND LEN(suzg.IdentityCard)=18
+ )
+ --Ѳ¼ݳʼ
+ INSERT INTO SANKU_GRID_PATROL(RECORD_ID,PROJECT_CODE,PROJECT_NAME,SUBCONTRACTOR_ID,SUBCONTRACTOR_CODE,SUBCONTRACTOR_NAME,PERSONNEL_ID_NUMBER,PERSONNEL_NAME,PATROL_TIME,PATROL_STATUS,SUBMITTER_ID_NUMBER,SUBMITTER_NAME,UPDATE_TIME,CREATE_TIME)
+ SELECT HazardRegisterId,pro_code,pro_name,MasterAdOrgCode,CollCropCode,UnitName,pNumber,pUser,CheckTime,StatusStr,IdentityCard,UserName,UpdateTime,CreateTime
+ FROM temp_data
+ WHERE rn = 1 AND HazardRegisterId NOT IN (SELECT RECORD_ID FROM SANKU_GRID_PATROL WITH(NOLOCK));
+ END
+
+ END
+END
+GO
+
+
diff --git a/SUBQHSE/BLL/API/HSSE/APITestPlanService.cs b/SUBQHSE/BLL/API/HSSE/APITestPlanService.cs
index 7c888e7..68d3a96 100644
--- a/SUBQHSE/BLL/API/HSSE/APITestPlanService.cs
+++ b/SUBQHSE/BLL/API/HSSE/APITestPlanService.cs
@@ -530,6 +530,13 @@ namespace BLL
itemRecord.TestScores = db.Training_TestRecordItem.Where(x => x.TestRecordId == itemRecord.TestRecordId).Sum(x => x.SubjectScore) ?? 0;
db.SubmitChanges();
}
+ //更新三库考试考核
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateExaminationRecord(getTestPlan.TestPlanId, ref message);
+ //if (!string.IsNullOrWhiteSpace(message))
+ //{
+ // ShowNotify(message, MessageBoxIcon.Warning);
+ //}
var getTrainingTasks = from x in db.Training_Task
where x.PlanId == getTestPlan.PlanId && (x.States != "2" || x.States == null)
diff --git a/SUBQHSE/BLL/API/HSSE/APITestRecordService.cs b/SUBQHSE/BLL/API/HSSE/APITestRecordService.cs
index 03cd753..22b811e 100644
--- a/SUBQHSE/BLL/API/HSSE/APITestRecordService.cs
+++ b/SUBQHSE/BLL/API/HSSE/APITestRecordService.cs
@@ -777,6 +777,13 @@ namespace BLL
db.SubmitChanges();
getCode = getTestRecord.TestScores ?? 0;
+ //更新三库考试考核
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateExaminationRecordItem(testRecord.TestRecordId, ref message);
+ //if (!string.IsNullOrWhiteSpace(message))
+ //{
+ // ShowNotify(message, MessageBoxIcon.Warning);
+ //}
}
}
@@ -824,6 +831,17 @@ namespace BLL
}
}
}
+ if (getAllTestRecords.Count() > 0)
+ {
+ //更新三库考试考核
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateExaminationRecord(getTestPlan.TestPlanId, ref message);
+ //if (!string.IsNullOrWhiteSpace(message))
+ //{
+ // ShowNotify(message, MessageBoxIcon.Warning);
+ //}
+ }
+
}
}
}
diff --git a/SUBQHSE/BLL/API/HSSE/APITrainRecordService.cs b/SUBQHSE/BLL/API/HSSE/APITrainRecordService.cs
index 496fb79..92f1203 100644
--- a/SUBQHSE/BLL/API/HSSE/APITrainRecordService.cs
+++ b/SUBQHSE/BLL/API/HSSE/APITrainRecordService.cs
@@ -314,6 +314,14 @@ namespace BLL
}
+ //更新三库教育培训
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateTrainingRecord(newTrainRecord.TrainingId, ref message);
+ //if (!string.IsNullOrWhiteSpace(message))
+ //{
+ // ShowNotify(message, MessageBoxIcon.Warning);
+ //}
+
////增加一条编码记录
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectTrainRecordMenuId, newTrainRecord.ProjectId, null, newTrainRecord.TrainingId, newTrainRecord.TrainStartDate);
diff --git a/SUBQHSE/BLL/BLL.csproj b/SUBQHSE/BLL/BLL.csproj
index 8b1155d..e8c004b 100644
--- a/SUBQHSE/BLL/BLL.csproj
+++ b/SUBQHSE/BLL/BLL.csproj
@@ -69,8 +69,8 @@
..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll
-
- ..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll
@@ -331,6 +331,7 @@
+
@@ -471,6 +472,8 @@
+
+
@@ -870,6 +873,9 @@
+
+
+
True
True
diff --git a/SUBQHSE/BLL/CQMS/Check/AdminPenaltyService.cs b/SUBQHSE/BLL/CQMS/Check/AdminPenaltyService.cs
new file mode 100644
index 0000000..19a2ca0
--- /dev/null
+++ b/SUBQHSE/BLL/CQMS/Check/AdminPenaltyService.cs
@@ -0,0 +1,97 @@
+using System.Linq;
+
+namespace BLL
+{
+ ///
+ /// 行政处罚
+ ///
+ public class AdminPenaltyService
+ {
+ ///
+ /// 获取行政处罚信息
+ ///
+ ///
+ ///
+ public static Model.Check_AdminPenalty GetAdminPenaltyById(string PenaltyId)
+ {
+ return Funs.DB.Check_AdminPenalty.FirstOrDefault(e => e.PenaltyId == PenaltyId);
+ }
+
+ ///
+ /// 添加行政处罚信息
+ ///
+ ///
+ public static void AddAdminPenalty(Model.Check_AdminPenalty model)
+ {
+ Model.SUBQHSEDB db = Funs.DB;
+ Model.Check_AdminPenalty newModel = new Model.Check_AdminPenalty();
+ newModel.PenaltyId = model.PenaltyId;
+ newModel.ProjectId = model.ProjectId;
+ newModel.PenaltyCode = model.PenaltyCode;
+ newModel.UnitId = model.UnitId;
+ newModel.UnitName = model.UnitName;
+ newModel.PenaltyDate = model.PenaltyDate;
+ newModel.PenaltyType = model.PenaltyType;
+ newModel.PenaltyContent = model.PenaltyContent;
+ newModel.PenaltyAmount = model.PenaltyAmount;
+ newModel.PenaltyAuthority = model.PenaltyAuthority;
+ newModel.PenaltyStatus = model.PenaltyStatus;
+ newModel.CompileMan = model.CompileMan;
+ newModel.CompileDate = model.CompileDate;
+ newModel.Remark = model.Remark;
+ newModel.SysType = model.SysType;
+ db.Check_AdminPenalty.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ ////增加一条编码记录
+ string menuId = BLL.Const.AdminPenaltyMenuId;
+ BLL.CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(menuId, model.ProjectId, null, model.PenaltyId, model.PenaltyDate);
+ }
+
+ ///
+ /// 修改行政处罚信息
+ ///
+ ///
+ public static void UpdateAdminPenalty(Model.Check_AdminPenalty model)
+ {
+ Model.SUBQHSEDB db = Funs.DB;
+ Model.Check_AdminPenalty newModel = db.Check_AdminPenalty.FirstOrDefault(e => e.PenaltyId == model.PenaltyId);
+ if (newModel != null)
+ {
+ //newModel.PenaltyId = model.PenaltyId;
+ //newModel.ProjectId = model.ProjectId;
+ newModel.PenaltyCode = model.PenaltyCode;
+ newModel.UnitId = model.UnitId;
+ newModel.UnitName = model.UnitName;
+ newModel.PenaltyDate = model.PenaltyDate;
+ newModel.PenaltyType = model.PenaltyType;
+ newModel.PenaltyContent = model.PenaltyContent;
+ newModel.PenaltyAmount = model.PenaltyAmount;
+ newModel.PenaltyAuthority = model.PenaltyAuthority;
+ newModel.PenaltyStatus = model.PenaltyStatus;
+ //newModel.CompileMan = model.CompileMan;
+ //newModel.CompileDate = model.CompileDate;
+ newModel.Remark = model.Remark;
+ newModel.SysType = model.SysType;
+ db.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据主键删除行政处罚信息
+ ///
+ ///
+ public static void DeleteAdminPenaltyById(string PenaltyId)
+ {
+ Model.SUBQHSEDB db = Funs.DB;
+ Model.Check_AdminPenalty model = db.Check_AdminPenalty.FirstOrDefault(e => e.PenaltyId == PenaltyId);
+ if (model != null)
+ {
+ //删除对应的附件
+ BLL.UploadFileService.DeleteFile(Funs.RootPath, AttachFileService.getFileUrl(model.PenaltyId));
+ db.Check_AdminPenalty.DeleteOnSubmit(model);
+ db.SubmitChanges();
+ }
+ }
+ }
+}
+
diff --git a/SUBQHSE/BLL/Common/Const.cs b/SUBQHSE/BLL/Common/Const.cs
index b24991b..c6fa7a5 100644
--- a/SUBQHSE/BLL/Common/Const.cs
+++ b/SUBQHSE/BLL/Common/Const.cs
@@ -4498,6 +4498,10 @@ namespace BLL
///
public const string RewardAndPunishMenuId = "288C955A-E379-4F24-85F9-585343B33D46";
///
+ /// 行政处罚菜单
+ ///
+ public const string AdminPenaltyMenuId = "67EE8A9B-2C49-47ED-B4A1-DCC90A4AD111";
+ ///
/// 实测实量
///
public const string Check_ActualMeasuredQuantityMenuId = "A3EDB1E6-6BCE-4AB7-95DE-C1E31BCC5EF0";
diff --git a/SUBQHSE/BLL/Common/ConstValue.cs b/SUBQHSE/BLL/Common/ConstValue.cs
index 1f9bcbb..4eb6295 100644
--- a/SUBQHSE/BLL/Common/ConstValue.cs
+++ b/SUBQHSE/BLL/Common/ConstValue.cs
@@ -339,6 +339,12 @@ namespace BLL
/// -事故调查处理报告：组id
///
public const string Group_AccidentInvestigationProcessingReport = "AccidentInvestigationProcessingReport";
+
+ ///
+ /// -惩罚类型：组id
+ ///
+ public const string Group_PunishType = "PunishType";
+
///
/// -奖励类型：组id
///
diff --git a/SUBQHSE/BLL/DataGovernance/MasterOrgService.cs b/SUBQHSE/BLL/DataGovernance/MasterOrgService.cs
new file mode 100644
index 0000000..01035b1
--- /dev/null
+++ b/SUBQHSE/BLL/DataGovernance/MasterOrgService.cs
@@ -0,0 +1,107 @@
+using Model;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BLL
+{
+ ///
+ /// 数据治理服务
+ ///
+ public static class MasterOrgService
+ {
+ ///
+ /// 获取已启用的组织单位
+ ///
+ ///
+ public static List GetMasterOrgUnits()
+ {
+ var q = (from x in Funs.DB.CNCEC_MasterData_ad_org where x.OrgType == "01" && x.IsEnable == "1" orderby x.AdOrgCode select x ).ToList();
+ return q;
+ }
+
+ ///
+ /// 根据组织编码获取组织信息
+ ///
+ ///
+ ///
+ public static CNCEC_MasterData_ad_org GetMasterOrg(string AdOrgCode)
+ {
+ var q = (from x in Funs.DB.CNCEC_MasterData_ad_org where x.AdOrgCode == AdOrgCode select x).FirstOrDefault();
+ return q;
+ }
+
+ #region 获取集团主数据组织架构
+
+ ///
+ /// 获取集团主数据组织架构
+ ///
+ ///
+ ///
+ public static Model.ResponeData GetMasterOrgDataInfos(string userName)
+ {
+ var db = Funs.DB;
+ var responeData = new Model.ResponeData();
+ try
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ Dictionary dic = new Dictionary()
+ {
+ {"collCropCode", thisUnit.CollCropCode}
+ };
+ List projectlist = new List();
+ var returnData = ServerService.GerDataFromCncec("/api/Common/GetMasterOrgDataByCollCropCode", dic, null);
+ if (returnData != null && returnData.code == 1)
+ {
+ projectlist = JsonConvert.DeserializeObject>(returnData.data.ToString());
+ if (projectlist.Any())
+ {
+ var oldProList = from x in db.CNCEC_MasterData_ad_org select x;
+ if (oldProList.Any())
+ {
+ db.CNCEC_MasterData_ad_org.DeleteAllOnSubmit(oldProList);
+ db.SubmitChanges();
+ }
+ db.CNCEC_MasterData_ad_org.InsertAllOnSubmit(projectlist);
+ db.SubmitChanges();
+ string msg = $"成功获取{projectlist.Count()}条组织机构信息";
+ responeData.message = msg;
+
+ //记录操作日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = "其它";
+ newModel.CONTENT = "获取主数据组织架构信息";
+ newModel.RESULT = "成功";
+ newModel.DETAIL = msg;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ string msg = ex.Message;
+ responeData.code = 0;
+ responeData.message = "获取失败，具体错误信息请查看三库操作日志";
+ //记录操作日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = "其它";
+ newModel.CONTENT = "获取主数据组织架构信息";
+ newModel.RESULT = "失败";
+ newModel.DETAIL = msg;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ }
+
+ return responeData;
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/BLL/DataGovernance/PreProjectApplyService.cs b/SUBQHSE/BLL/DataGovernance/PreProjectApplyService.cs
new file mode 100644
index 0000000..52cb1d3
--- /dev/null
+++ b/SUBQHSE/BLL/DataGovernance/PreProjectApplyService.cs
@@ -0,0 +1,128 @@
+using Model;
+using System.Linq;
+namespace BLL
+{
+ ///
+ /// 项目申请预立项
+ ///
+ public static class PreProjectApplyService
+ {
+ ///
+ /// 根据主键Id查询申请预立项数据
+ ///
+ ///
+ ///
+ public static Model.DataGovernance_PreProjectApply GetPreProjectApplyById(string Id)
+ {
+ return Funs.DB.DataGovernance_PreProjectApply.FirstOrDefault(e => e.Id == Id);
+ }
+
+ ///
+ /// 根据项目名称查询申请预立项数据
+ ///
+ ///
+ ///
+ public static Model.DataGovernance_PreProjectApply GetPreProjectApplyByProjectName(string projectName)
+ {
+ return Funs.DB.DataGovernance_PreProjectApply.FirstOrDefault(e => e.ProjectName == projectName);
+ }
+
+ ///
+ /// 删除申请
+ ///
+ ///
+ public static void DeletePreProjectApply(string Id)
+ {
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ DataGovernance_PreProjectApply apply = db.DataGovernance_PreProjectApply.FirstOrDefault(e => e.Id == Id);
+ if (apply != null)
+ {
+ db.DataGovernance_PreProjectApply.DeleteOnSubmit(apply);
+ db.SubmitChanges();
+ }
+ }
+ }
+
+ ///
+ /// 添加项目申请预立项
+ ///
+ ///
+ public static void AddPreProjectApply(Model.DataGovernance_PreProjectApply model)
+ {
+ Model.SUBQHSEDB db = Funs.DB;
+ Model.DataGovernance_PreProjectApply newModel = new Model.DataGovernance_PreProjectApply();
+ newModel.Id = model.Id;
+ newModel.UnitId = model.UnitId;
+ newModel.UnitName = model.UnitName;
+ newModel.ProjectName = model.ProjectName;
+ newModel.ApplyType = model.ApplyType;
+ newModel.ApplyUserId = model.ApplyUserId;
+ newModel.ApplyUserName = model.ApplyUserName;
+ newModel.ApplyDescription = model.ApplyDescription;
+ newModel.ApplyDate = model.ApplyDate;
+ newModel.ApproverUserId = model.ApproverUserId;
+ newModel.ApproverUserName = model.ApproverUserName;
+ //newModel.ApprovalDescription = model.ApprovalDescription;
+ //newModel.ApprovalDate = model.ApprovalDate;
+ newModel.State = model.State;
+
+ db.DataGovernance_PreProjectApply.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 修改项目申请预立项
+ ///
+ ///
+ public static void UpdatePreProjectApply(Model.DataGovernance_PreProjectApply model)
+ {
+ using (var db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ Model.DataGovernance_PreProjectApply newModel = db.DataGovernance_PreProjectApply.First(e => e.Id == model.Id);
+ newModel.UnitId = model.UnitId;
+ newModel.UnitName = model.UnitName;
+ newModel.ProjectName = model.ProjectName;
+ newModel.ApplyType = model.ApplyType;
+ newModel.ApplyUserId = model.ApplyUserId;
+ newModel.ApplyUserName = model.ApplyUserName;
+ newModel.ApplyDescription = model.ApplyDescription;
+ //newModel.ApplyDate = model.ApplyDate;
+ newModel.ApproverUserId = model.ApproverUserId;
+ newModel.ApproverUserName = model.ApproverUserName;
+ //newModel.ApprovalDescription = model.ApprovalDescription;
+ //newModel.ApprovalDate = model.ApprovalDate;
+ newModel.State = model.State;
+
+ db.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 审核
+ ///
+ ///
+ public static void ApprovalPreProjectApply(Model.DataGovernance_PreProjectApply model)
+ {
+ using (var db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ Model.DataGovernance_PreProjectApply newModel = db.DataGovernance_PreProjectApply.First(e => e.Id == model.Id);
+ //newModel.UnitId = model.UnitId;
+ //newModel.UnitName = model.UnitName;
+ //newModel.ProjectName = model.ProjectName;
+ //newModel.ApplyType = model.ApplyType;
+ //newModel.ApplyUserId = model.ApplyUserId;
+ //newModel.ApplyUserName = model.ApplyUserName;
+ //newModel.ApplyDescription = model.ApplyDescription;
+ //newModel.ApplyDate = model.ApplyDate;
+ newModel.ApproverUserId = model.ApproverUserId;
+ newModel.ApproverUserName = model.ApproverUserName;
+ newModel.ApprovalDescription = model.ApprovalDescription;
+ newModel.ApprovalDate = model.ApprovalDate;
+ newModel.State = model.State;
+
+ db.SubmitChanges();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/BLL/HSSE/Accident/AccidentHandleService.cs b/SUBQHSE/BLL/HSSE/Accident/AccidentHandleService.cs
index 746c266..b97f317 100644
--- a/SUBQHSE/BLL/HSSE/Accident/AccidentHandleService.cs
+++ b/SUBQHSE/BLL/HSSE/Accident/AccidentHandleService.cs
@@ -48,7 +48,18 @@ namespace BLL
DeathPersonNum = accidentHandle.DeathPersonNum,
InjuriesPersonNum = accidentHandle.InjuriesPersonNum,
MinorInjuriesPersonNum = accidentHandle.MinorInjuriesPersonNum,
- WorkHoursLoss = accidentHandle.WorkHoursLoss
+ WorkHoursLoss = accidentHandle.WorkHoursLoss,
+ AccidentLevel = accidentHandle.AccidentLevel,
+ AccidentType = accidentHandle.AccidentType,
+ AccidentLocation = accidentHandle.AccidentLocation,
+ IndirectMoneyLoss = accidentHandle.IndirectMoneyLoss,
+ ContractingResponsibility = accidentHandle.ContractingResponsibility,
+ PositionName = accidentHandle.PositionName,
+ ResponsibilityType = accidentHandle.ResponsibilityType,
+ ResponsibilityDesc = accidentHandle.ResponsibilityDesc,
+ ResponsibleMan = accidentHandle.ResponsibleMan,
+ ResponsibleManName = accidentHandle.ResponsibleManName,
+
};
db.Accident_AccidentHandle.InsertOnSubmit(newAccidentHandle);
db.SubmitChanges();
@@ -82,6 +93,17 @@ namespace BLL
newAccidentHandle.InjuriesPersonNum = accidentHandle.InjuriesPersonNum;
newAccidentHandle.MinorInjuriesPersonNum = accidentHandle.MinorInjuriesPersonNum;
newAccidentHandle.WorkHoursLoss = accidentHandle.WorkHoursLoss;
+ newAccidentHandle.AccidentLevel = accidentHandle.AccidentLevel;
+ newAccidentHandle.AccidentType = accidentHandle.AccidentType;
+ newAccidentHandle.AccidentLocation = accidentHandle.AccidentLocation;
+ newAccidentHandle.IndirectMoneyLoss = accidentHandle.IndirectMoneyLoss;
+ newAccidentHandle.ContractingResponsibility = accidentHandle.ContractingResponsibility;
+ newAccidentHandle.PositionName = accidentHandle.PositionName;
+ newAccidentHandle.ResponsibilityType = accidentHandle.ResponsibilityType;
+ newAccidentHandle.ResponsibilityDesc = accidentHandle.ResponsibilityDesc;
+ newAccidentHandle.ResponsibleMan = accidentHandle.ResponsibleMan;
+ newAccidentHandle.ResponsibleManName = accidentHandle.ResponsibleManName;
+
db.SubmitChanges();
}
}
diff --git a/SUBQHSE/BLL/HSSE/Check/ViolationPersonService.cs b/SUBQHSE/BLL/HSSE/Check/ViolationPersonService.cs
index 1d5a64b..782ac50 100644
--- a/SUBQHSE/BLL/HSSE/Check/ViolationPersonService.cs
+++ b/SUBQHSE/BLL/HSSE/Check/ViolationPersonService.cs
@@ -52,12 +52,18 @@ namespace BLL
ViolationDate = violationPerson.ViolationDate,
ViolationName = violationPerson.ViolationName,
ViolationType = violationPerson.ViolationType,
- CompileMan = violationPerson.CompileMan
+ CompileMan = violationPerson.CompileMan,
+ CompileDate = violationPerson.CompileDate
+
};
newViolationPerson.ViolationDate = violationPerson.ViolationDate;
newViolationPerson.States = violationPerson.States;
newViolationPerson.HandleStep = violationPerson.HandleStep;
newViolationPerson.ViolationDef = violationPerson.ViolationDef;
+ newViolationPerson.RectificationStatus = violationPerson.RectificationStatus;
+ newViolationPerson.ViolationLevel = violationPerson.ViolationLevel;
+
+
db.Check_ViolationPerson.InsertOnSubmit(newViolationPerson);
db.SubmitChanges();
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectViolationPersonMenuId, violationPerson.ProjectId, null, violationPerson.ViolationPersonId, violationPerson.CompileDate);
@@ -86,6 +92,9 @@ namespace BLL
newViolationPerson.States = violationPerson.States;
newViolationPerson.HandleStep = violationPerson.HandleStep;
newViolationPerson.ViolationDef = violationPerson.ViolationDef;
+ newViolationPerson.RectificationStatus = violationPerson.RectificationStatus;
+ newViolationPerson.ViolationLevel = violationPerson.ViolationLevel;
+
db.SubmitChanges();
}
}
diff --git a/SUBQHSE/BLL/HSSE/EduTrain/TestRecordService.cs b/SUBQHSE/BLL/HSSE/EduTrain/TestRecordService.cs
index 644b910..49e5dbf 100644
--- a/SUBQHSE/BLL/HSSE/EduTrain/TestRecordService.cs
+++ b/SUBQHSE/BLL/HSSE/EduTrain/TestRecordService.cs
@@ -162,6 +162,13 @@ namespace BLL
newTestRecord.IsFiled = testRecord.IsFiled;
db.SubmitChanges();
}
+ //更新三库考试考核
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateExaminationRecordItem(testRecord.TestRecordId, ref message);
+ //if (!string.IsNullOrWhiteSpace(message))
+ //{
+ // ShowNotify(message, MessageBoxIcon.Warning);
+ //}
}
///
diff --git a/SUBQHSE/BLL/HSSE/Solution/LargerHazardService.cs b/SUBQHSE/BLL/HSSE/Solution/LargerHazardService.cs
index 232d23a..6ff65fa 100644
--- a/SUBQHSE/BLL/HSSE/Solution/LargerHazardService.cs
+++ b/SUBQHSE/BLL/HSSE/Solution/LargerHazardService.cs
@@ -47,6 +47,8 @@ namespace BLL
Descriptions = largerHazard.Descriptions,
OperativesNum = largerHazard.OperativesNum,
ApprovalState = largerHazard.ApprovalState,
+ UnitId = largerHazard.UnitId,
+ StandbyPersonnelId = largerHazard.StandbyPersonnelId,
};
@@ -81,6 +83,8 @@ namespace BLL
newLargerHazard.IsUpdate = null;
newLargerHazard.OperativesNum = largerHazard.OperativesNum;
newLargerHazard.ApprovalState = largerHazard.ApprovalState;
+ newLargerHazard.UnitId = largerHazard.UnitId;
+ newLargerHazard.StandbyPersonnelId = largerHazard.StandbyPersonnelId;
db.SubmitChanges();
}
diff --git a/SUBQHSE/BLL/ProjectData/ProjectMasterDataAnalysisService.cs b/SUBQHSE/BLL/ProjectData/ProjectMasterDataAnalysisService.cs
index ab587dd..0f6e130 100644
--- a/SUBQHSE/BLL/ProjectData/ProjectMasterDataAnalysisService.cs
+++ b/SUBQHSE/BLL/ProjectData/ProjectMasterDataAnalysisService.cs
@@ -54,11 +54,13 @@ namespace BLL
Id = model.Id,
CollCropCode = model.CollCropCode,
UnitId = model.UnitId,
+ Total = model.Total,
YiShangXian = model.YiShangXian,
+ WeiShangXian = model.WeiShangXian,
+ ShenQingGuanBi = model.ShenQingGuanBi,
OnlineRate = model.OnlineRate,
ReportDate = model.ReportDate,
DataDate = model.DataDate,
- Total = model.Total,
MasterTotal = model.MasterTotal,
QHSETotal = model.QHSETotal,
ZhengChang = model.ZhengChang,
@@ -66,9 +68,9 @@ namespace BLL
BuYong = model.BuYong,
BuYongYiWanGong = model.BuYongYiWanGong,
BuYongTingHuanJian = model.BuYongTingHuanJian,
+ BuYongBuShiYong = model.BuYongBuShiYong,
BuYongTJShouXian = model.BuYongTJShouXian,
YuLiXiang = model.YuLiXiang,
- //ZiJian = model.ZiJian,
CreateUser = model.CreateUser,
ThisMonActiveUserNum = model.ThisMonActiveUserNum,
DailyAvg = model.DailyAvg,
@@ -93,9 +95,11 @@ namespace BLL
//newModel.UnitId = model.UnitId;
//newModel.ReportDate = model.ReportDate;
//newModel.DataDate = model.DataDate;
- newModel.YiShangXian = model.YiShangXian;
- newModel.OnlineRate = model.OnlineRate;
newModel.Total = model.Total;
+ newModel.YiShangXian = model.YiShangXian;
+ newModel.WeiShangXian = model.WeiShangXian;
+ newModel.ShenQingGuanBi = model.ShenQingGuanBi;
+ newModel.OnlineRate = model.OnlineRate;
newModel.MasterTotal = model.MasterTotal;
newModel.QHSETotal = model.QHSETotal;
newModel.ZhengChang = model.ZhengChang;
@@ -104,8 +108,8 @@ namespace BLL
newModel.BuYongYiWanGong = model.BuYongYiWanGong;
newModel.BuYongTingHuanJian = model.BuYongTingHuanJian;
newModel.BuYongTJShouXian = model.BuYongTJShouXian;
+ newModel.BuYongBuShiYong = model.BuYongBuShiYong;
newModel.YuLiXiang = model.YuLiXiang;
- //newModel.ZiJian = model.ZiJian;
newModel.ThisMonActiveUserNum = model.ThisMonActiveUserNum;
newModel.DailyAvg = model.DailyAvg;
newModel.TianBao = model.TianBao;
@@ -177,7 +181,7 @@ namespace BLL
from pro in proGroup.DefaultIfEmpty()
join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup
from use in useGroup.DefaultIfEmpty()
- where pro == null && (use == null || (use != null && (use.Reason == null || use.Reason == "")))
+ where pro == null && (use == null || (use != null && use.ReasonType == null))
select x).Count();
//3、申请不用
var buYongList = (from x in masterProDatas
@@ -185,24 +189,31 @@ namespace BLL
from pro in proGroup.DefaultIfEmpty()
join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup
from use in useGroup.DefaultIfEmpty()
- where pro == null && use != null && use.Is_use == false && use.Reason != null && use.Reason != ""
+ where pro == null && use != null && use.Is_use == false && use.ReasonType != null
select new { reason = use.Reason, reasonType = use.ReasonType }).ToList();
//申请不用总数
int buYong = buYongList.Count();
//申请不用——已完工
- int buYongYiWanGong = buYongList.Where(x => x.reasonType == "已完工").Count();
+ int buYongYiWanGong = buYongList.Where(x => x.reasonType == "已完工/撤场").Count();
//申请不用——停缓建
int buYongTingHuanJian = buYongList.Where(x => x.reasonType == "停缓建").Count();
+ //申请不用——不适用
+ int buYongBuShiYong = buYongList.Where(x => x.reasonType == "不适用").Count();
//申请不用——条件受限（其他）
- int buYongTJShouXian = buYong - buYongYiWanGong - buYongTingHuanJian;
+ int buYongTJShouXian = buYongList.Where(x => x.reasonType == "条件受限").Count();
+ //int buYongTJShouXian = buYong - buYongYiWanGong - buYongTingHuanJian - buYongBuShiYong;
//4、预立项
int yuLiXiang = (from x in projects where x.MasterSysId == null select x).Count();
- //应使用项目数=主数据项目+预立项-已完工-停缓建
- int beUsedProNum = masterTotal + yuLiXiang - buYongYiWanGong - buYongTingHuanJian;
- //已上线项目=已关联+预立项；
+ //应使用项目数：主数据项目+预立项-已完工-不适用
+ int beUsedProNum = masterTotal + yuLiXiang - buYongYiWanGong - buYongBuShiYong;
+ //已上线项目：已关联+预立项；
int yiShangXian = zhengChang + yuLiXiang;
+ //未上线总数：待上线+停缓建+条件受限；
+ int weiShangXian = daiJian + buYongTingHuanJian + buYongTJShouXian;
+ //申请关闭总数：已完工/撤场+不适用；
+ int shenQingGuanBi = buYongYiWanGong + buYongBuShiYong;
//上线率=100*已上线/应使用项目数
var onlineRate = (decimal)Math.Round((100.0 * yiShangXian / beUsedProNum), 2);
onlineRate = onlineRate > 100 ? 100 : onlineRate;
@@ -238,7 +249,9 @@ namespace BLL
UnitId = thisUnit.UnitId,
ReportDate = now.Date,
DataDate = now,
- YiShangXian= yiShangXian,
+ YiShangXian = yiShangXian,
+ WeiShangXian = weiShangXian,
+ ShenQingGuanBi = shenQingGuanBi,
OnlineRate = onlineRate,
Total = beUsedProNum,
MasterTotal = masterTotal,
@@ -248,6 +261,7 @@ namespace BLL
BuYong = buYong,
BuYongYiWanGong = buYongYiWanGong,
BuYongTingHuanJian = buYongTingHuanJian,
+ BuYongBuShiYong = buYongBuShiYong,
BuYongTJShouXian = buYongTJShouXian,
YuLiXiang = yuLiXiang,
CreateUser = userName,
diff --git a/SUBQHSE/BLL/ProjectData/ProjectService.cs b/SUBQHSE/BLL/ProjectData/ProjectService.cs
index ec5e9eb..3b8b8a6 100644
--- a/SUBQHSE/BLL/ProjectData/ProjectService.cs
+++ b/SUBQHSE/BLL/ProjectData/ProjectService.cs
@@ -1199,18 +1199,36 @@
{
{"collCropCode", thisUnit.CollCropCode}
};
-
+ //var cacheKey = "MasterDataProjectsInfo";
+ //if (CacheHelper.Exists(cacheKey))
+ //{
+ // return CacheHelper.Get>(cacheKey);
+ //}
List projectlist = new List();
var returnData = ServerService.GerDataFromCncec("/api/Common/GetMasterProjectDataByCollCropCode", dic, null);
if (returnData != null && returnData.code == 1)
{
projectlist = JsonConvert.DeserializeObject>(returnData.data.ToString());
+ //CacheHelper.Add(cacheKey, projectlist, DateTimeOffset.Now.AddHours(3));
+ if (projectlist.Any())
+ {
+ var db = Funs.DB;
+ var oldProList = from x in db.Ads_pms_pro_info_build select x;
+ if (oldProList.Any())
+ {
+ db.Ads_pms_pro_info_build.DeleteAllOnSubmit(oldProList);
+ db.SubmitChanges();
+ }
+ db.Ads_pms_pro_info_build.InsertAllOnSubmit(projectlist);
+ db.SubmitChanges();
+ }
}
return projectlist;
}
+
///
/// 获取主数据项目
///
diff --git a/SUBQHSE/BLL/ProjectData/ProjectUserService.cs b/SUBQHSE/BLL/ProjectData/ProjectUserService.cs
index baaac82..87a0531 100644
--- a/SUBQHSE/BLL/ProjectData/ProjectUserService.cs
+++ b/SUBQHSE/BLL/ProjectData/ProjectUserService.cs
@@ -61,7 +61,9 @@
RoleId = projectUser.RoleId,
IsPost = projectUser.IsPost,
MainCNProfessionalId = projectUser.MainCNProfessionalId,
- ViceCNProfessionalId = projectUser.ViceCNProfessionalId
+ ViceCNProfessionalId = projectUser.ViceCNProfessionalId,
+ IsGridWorker = projectUser.IsGridWorker,
+
};
//newProjectUser.RoleName = projectUser.RoleName;
newProjectUser.IsEducator = projectUser.IsEducator;
@@ -91,6 +93,7 @@
newProjectUser.ViceCNProfessionalId = projectUser.ViceCNProfessionalId;
//newProjectUser.RoleName = projectUser.RoleName;
newProjectUser.IsEducator = projectUser.IsEducator;
+ newProjectUser.IsGridWorker = projectUser.IsGridWorker;
db.SubmitChanges();
}
}
diff --git a/SUBQHSE/BLL/SanKu/MasterProjectDataService.cs b/SUBQHSE/BLL/SanKu/MasterProjectDataService.cs
new file mode 100644
index 0000000..086b46b
--- /dev/null
+++ b/SUBQHSE/BLL/SanKu/MasterProjectDataService.cs
@@ -0,0 +1,144 @@
+using Model;
+using System.Collections.Generic;
+using System.Linq;
+namespace BLL
+{
+ ///
+ /// 集团主数据项目
+ ///
+ public static class MasterProjectDataService
+ {
+ ///
+ /// 获取已关联集团主数据项目的项目
+ ///
+ ///
+ ///
+ public static List GetProjectFromMasterProject()
+ {
+ var db = Funs.DB;
+ var list = (from x in db.Base_Project
+ join y in db.Ads_pms_pro_info_build on x.MasterSysId equals y.Pro_id
+ where x.MasterSysId != null
+ select x).ToList();
+ return list;
+ }
+
+ ///
+ /// 获取已关联集团主数据项目的项目Id
+ ///
+ ///
+ ///
+ public static List GetProjectIdsFromMasterProject()
+ {
+ var db = Funs.DB;
+ var list = (from x in db.Base_Project
+ join y in db.Ads_pms_pro_info_build on x.MasterSysId equals y.Pro_id
+ where x.MasterSysId != null && y != null
+ select x.ProjectId).ToList();
+ return list;
+ }
+
+ ///
+ /// 根据主键Id查询集团主数据项目数据
+ ///
+ ///
+ ///
+ public static Model.Ads_pms_pro_info_build GetMasterProjectById(string Id)
+ {
+ return Funs.DB.Ads_pms_pro_info_build.FirstOrDefault(e => e.Pro_id == Id);
+ }
+
+ ///
+ /// 根据项目名称查询集团主数据项目数据
+ ///
+ ///
+ ///
+ public static Model.Ads_pms_pro_info_build GetMasterProjectByProjectName(string projectName)
+ {
+ return Funs.DB.Ads_pms_pro_info_build.FirstOrDefault(e => e.Pro_name == projectName);
+ }
+
+ ///
+ /// 删除
+ ///
+ ///
+ public static void DeleteMasterProject(string Id)
+ {
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ Ads_pms_pro_info_build apply = db.Ads_pms_pro_info_build.FirstOrDefault(e => e.Pro_id == Id);
+ if (apply != null)
+ {
+ db.Ads_pms_pro_info_build.DeleteOnSubmit(apply);
+ db.SubmitChanges();
+ }
+ }
+ }
+
+ ///
+ /// 添加项目集团主数据项目
+ ///
+ ///
+ public static void AddMasterProject(Model.Ads_pms_pro_info_build model)
+ {
+ Model.SUBQHSEDB db = Funs.DB;
+ Model.Ads_pms_pro_info_build newModel = new Model.Ads_pms_pro_info_build();
+ newModel.Main_data_code = model.Main_data_code;
+ newModel.Pro_id = model.Pro_id;
+ newModel.Pro_code = model.Pro_code;
+ newModel.Pro_name = model.Pro_name;
+ newModel.Pro_short_name = model.Pro_short_name;
+ newModel.Org_id = model.Org_id;
+ newModel.Org_id2 = model.Org_id2;
+ newModel.Org_name = model.Org_name;
+ newModel.Org_name2 = model.Org_name2;
+ newModel.Pro_nature = model.Pro_nature;
+ newModel.Pro_nature_code = model.Pro_nature_code;
+ newModel.Start_date = model.Start_date;
+ newModel.End_date = model.End_date;
+ newModel.Address = model.Address;
+ newModel.Pro_add_type = model.Pro_add_type;
+ newModel.Ori_amt_sum_vat_fc = model.Ori_amt_sum_vat_fc;
+ newModel.Amt_add_sum_vat_fc_local = model.Amt_add_sum_vat_fc_local;
+ newModel.Con_mode_code = model.Con_mode_code;
+ newModel.Con_mode_desc = model.Con_mode_desc;
+
+ db.Ads_pms_pro_info_build.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 修改项目集团主数据项目
+ ///
+ ///
+ public static void UpdateMasterProject(Model.Ads_pms_pro_info_build model)
+ {
+ using (var db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ Model.Ads_pms_pro_info_build newModel = db.Ads_pms_pro_info_build.First(e => e.Pro_id == model.Pro_id);
+ //newModel.Main_data_code = model.Main_data_code;
+ //newModel.Pro_id = model.Pro_id;
+ newModel.Pro_code = model.Pro_code;
+ newModel.Pro_name = model.Pro_name;
+ newModel.Pro_short_name = model.Pro_short_name;
+ newModel.Org_id = model.Org_id;
+ newModel.Org_id2 = model.Org_id2;
+ newModel.Org_name = model.Org_name;
+ newModel.Org_name2 = model.Org_name2;
+ newModel.Pro_nature = model.Pro_nature;
+ newModel.Pro_nature_code = model.Pro_nature_code;
+ newModel.Start_date = model.Start_date;
+ newModel.End_date = model.End_date;
+ newModel.Address = model.Address;
+ newModel.Pro_add_type = model.Pro_add_type;
+ newModel.Ori_amt_sum_vat_fc = model.Ori_amt_sum_vat_fc;
+ newModel.Amt_add_sum_vat_fc_local = model.Amt_add_sum_vat_fc_local;
+ newModel.Con_mode_code = model.Con_mode_code;
+ newModel.Con_mode_desc = model.Con_mode_desc;
+
+ db.SubmitChanges();
+ }
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs b/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs
new file mode 100644
index 0000000..28b4274
--- /dev/null
+++ b/SUBQHSE/BLL/SanKu/SanKuDataSummaryReportService.cs
@@ -0,0 +1,2676 @@
+using Model;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+namespace BLL
+{
+ ///
+ /// 三库业务数据汇总上报
+ ///
+ public static class SanKuDataSummaryReportService
+ {
+ #region 数据操作
+
+ ///
+ /// 收集三库业务数据
+ ///
+ public static string DataCollectOp()
+ {
+ var db = Funs.DB;
+ string resultStr = string.Empty;
+ string msg = string.Empty;
+ try
+ {
+ var result = Funs.DB.SP_SANKU_DATA_INIT("", 1);
+ resultStr = "成功";
+ msg = $"收集三库业务数据";
+ }
+ catch (Exception ex)
+ {
+ resultStr = "失败";
+ msg = JsonConvert.SerializeObject(ex);
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = "数据操作";
+ newModel.CONTENT = msg;
+ newModel.RESULT = resultStr;
+ newModel.DETAIL = msg;
+ newModel.OPERATOR = "定时任务";
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ return resultStr == "成功" ? "1" : "0";
+ }
+
+ #endregion
+
+ #region 业务更新
+
+ #region 事故事件
+
+ ///
+ /// 更新事故事件数据
+ ///
+ /// 事故id
+ ///
+ ///
+ public static string UpdateAccidentRecord(string accidentHandleId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var models = from tba in db.Accident_AccidentHandle
+ join bu in db.Base_Unit on tba.UnitId equals bu.UnitId
+ join su in db.Sys_User on tba.ResponsibleMan equals su.UserId
+ join suc in db.Sys_User on tba.CompileMan equals suc.UserId
+ join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.AccidentHandleId == accidentHandleId
+ select new SankuAccident
+ {
+ ACCIDENT_ID = tba.AccidentHandleId,
+ //PROJECT_CODE = pms.Pro_code.ToString(),
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ ACCIDENT_NAME = tba.AccidentHandleName,
+ ACCIDENT_TIME = tba.AccidentDate,
+ ACCIDENT_LEVEL = tba.AccidentLevel,
+ ACCIDENT_TYPE = tba.AccidentType,
+ ACCIDENT_LOCATION = tba.AccidentLocation,
+ ACCIDENT_DESCRIPTION = tba.AccidentDef,
+ DEATH_COUNT = (int)tba.DeathPersonNum,
+ SERIOUS_INJURY_COUNT = (int)tba.InjuriesPersonNum,
+ MINOR_INJURY_COUNT = (int)tba.MinorInjuriesPersonNum,
+ DIRECT_ECONOMIC_LOSS = (decimal)tba.MoneyLoss,
+ INDIRECT_ECONOMIC_LOSS = (decimal)tba.IndirectMoneyLoss,
+ CONTRACTING_RESPONSIBILITY = tba.ContractingResponsibility,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ POSITION_NAME = tba.PositionName,
+ RESPONSIBILITY_TYPE = tba.ResponsibilityType,
+ RESPONSIBILITY_DESC = tba.ResponsibilityDesc,
+ PERSONNEL_ID_NUMBER = su.IdentityCard,
+ PERSONNEL_NAME = tba.ResponsibleManName,
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ UPDATE_TIME = (DateTime)tba.CompileDate,
+ CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ List errMsgs = new List();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ errMsgs.Add("责任单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ errMsgs.Add("责任单位未关联主数据组织且统一社会信用代码异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.PERSONNEL_ID_NUMBER) && model.PERSONNEL_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("分包人员身份证异常");
+ //}
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (errMsgs.Any())
+ {
+ message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ else
+ {
+ var exist = db.SANKU_ACCIDENT_RECORD.Where(x => x.ACCIDENT_ID == model.ACCIDENT_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.ACCIDENT_ID = model.ACCIDENT_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.ACCIDENT_NAME = model.ACCIDENT_NAME;
+ exist.ACCIDENT_TIME = model.ACCIDENT_TIME;
+ exist.ACCIDENT_LEVEL = model.ACCIDENT_LEVEL;
+ exist.ACCIDENT_TYPE = model.ACCIDENT_TYPE;
+ exist.ACCIDENT_LOCATION = model.ACCIDENT_LOCATION;
+ exist.ACCIDENT_DESCRIPTION = model.ACCIDENT_DESCRIPTION;
+ exist.DEATH_COUNT = model.DEATH_COUNT;
+ exist.SERIOUS_INJURY_COUNT = model.SERIOUS_INJURY_COUNT;
+ exist.MINOR_INJURY_COUNT = model.MINOR_INJURY_COUNT;
+ exist.DIRECT_ECONOMIC_LOSS = model.DIRECT_ECONOMIC_LOSS;
+ exist.INDIRECT_ECONOMIC_LOSS = model.INDIRECT_ECONOMIC_LOSS;
+ exist.CONTRACTING_RESPONSIBILITY = model.CONTRACTING_RESPONSIBILITY;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.POSITION_NAME = model.POSITION_NAME;
+ exist.RESPONSIBILITY_TYPE = model.RESPONSIBILITY_TYPE;
+ exist.RESPONSIBILITY_DESC = model.RESPONSIBILITY_DESC;
+ exist.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ exist.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_ACCIDENT_RECORD();
+ newModel.ACCIDENT_ID = model.ACCIDENT_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.ACCIDENT_NAME = model.ACCIDENT_NAME;
+ newModel.ACCIDENT_TIME = model.ACCIDENT_TIME;
+ newModel.ACCIDENT_LEVEL = model.ACCIDENT_LEVEL;
+ newModel.ACCIDENT_TYPE = model.ACCIDENT_TYPE;
+ newModel.ACCIDENT_LOCATION = model.ACCIDENT_LOCATION;
+ newModel.ACCIDENT_DESCRIPTION = model.ACCIDENT_DESCRIPTION;
+ newModel.DEATH_COUNT = model.DEATH_COUNT;
+ newModel.SERIOUS_INJURY_COUNT = model.SERIOUS_INJURY_COUNT;
+ newModel.MINOR_INJURY_COUNT = model.MINOR_INJURY_COUNT;
+ newModel.DIRECT_ECONOMIC_LOSS = model.DIRECT_ECONOMIC_LOSS;
+ newModel.INDIRECT_ECONOMIC_LOSS = model.INDIRECT_ECONOMIC_LOSS;
+ newModel.CONTRACTING_RESPONSIBILITY = model.CONTRACTING_RESPONSIBILITY;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.POSITION_NAME = model.POSITION_NAME;
+ newModel.RESPONSIBILITY_TYPE = model.RESPONSIBILITY_TYPE;
+ newModel.RESPONSIBILITY_DESC = model.RESPONSIBILITY_DESC;
+ newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ newModel.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = model.CREATE_TIME;
+ db.SANKU_ACCIDENT_RECORD.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+
+ return result;
+ }
+ }
+
+ #endregion
+
+ #region 违章作业
+
+ ///
+ /// 更新违章作业数据
+ ///
+ /// 违章作业id
+ ///
+ ///
+ public static string UpdateViolationRecord(string recordId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var models = from tba in db.Check_ViolationPerson
+ join bu in db.Base_Unit on tba.UnitId equals bu.UnitId
+ join spp in db.SitePerson_Person on tba.PersonId equals spp.PersonId
+ join suc in db.Sys_User on tba.CompileMan equals suc.UserId
+ join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.ViolationPersonId == recordId
+ select new SankuViolation
+ {
+ RECORD_ID = tba.ViolationPersonId,
+ //PROJECT_CODE = pms.Pro_code.ToString(),
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ PERSONNEL_ID_NUMBER = spp.IdentityCard,
+ PERSONNEL_NAME = spp.PersonName,
+ VIOLATION_DATE = (DateTime)tba.ViolationDate,
+ VIOLATION_TYPE = tba.ViolationLevel,
+ VIOLATION_CONTENT = tba.ViolationDef,
+ PENALTY_RESULT = tba.RectificationStatus,
+ RECTIFICATION_STATUS = ViolatioResult(tba.HandleStep),
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ UPDATE_TIME = (DateTime)tba.CompileDate,
+ CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ List errMsgs = new List();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ errMsgs.Add("违章人员单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ errMsgs.Add("违章人员单位未关联主数据组织且统一社会信用代码异常");
+ }
+ if (!string.IsNullOrWhiteSpace(model.PERSONNEL_ID_NUMBER) && model.PERSONNEL_ID_NUMBER.Length != 18)
+ {
+ errMsgs.Add("违章人员身份证异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (errMsgs.Any())
+ {
+ message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ else
+ {
+ var exist = db.SANKU_VIOLATION.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ exist.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ exist.VIOLATION_DATE = model.VIOLATION_DATE;
+ exist.VIOLATION_TYPE = model.VIOLATION_TYPE;
+ exist.VIOLATION_CONTENT = model.VIOLATION_CONTENT;
+ exist.PENALTY_RESULT = model.PENALTY_RESULT;
+ exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_VIOLATION();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ newModel.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ newModel.VIOLATION_DATE = model.VIOLATION_DATE;
+ newModel.VIOLATION_TYPE = model.VIOLATION_TYPE;
+ newModel.VIOLATION_CONTENT = model.VIOLATION_CONTENT;
+ newModel.PENALTY_RESULT = model.PENALTY_RESULT;
+ newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = model.CREATE_TIME;
+ db.SANKU_VIOLATION.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+
+ return result;
+ }
+ }
+
+ ///
+ /// 违章作业处理结果
+ ///
+ ///
+ public static string ViolatioResult(string value)
+ {
+ string result = string.Empty;
+ var constObj = BLL.ConstValue.GetConstByConstValueAndGroupId(value, BLL.ConstValue.Group_ViolationPersonHandleStep);
+ if (constObj != null)
+ {
+ result = constObj.ConstText;
+ }
+ return result;
+ }
+
+ #endregion
+
+ #region 安全奖惩
+
+ ///
+ /// 更新安全奖惩数据
+ ///
+ /// 安全奖惩id
+ ///
+ ///
+ public static string UpdateSafetyRewardRecord(string recordId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var models = from tba in db.Check_RewardAndPunish
+ join spp in db.SitePerson_Person on tba.RewardAndPunishMan equals spp.PersonId
+ join bu in db.Base_Unit on tba.ResponseUnit equals bu.UnitId
+ join suc in db.Sys_User on tba.CreateMan equals suc.UserId
+ join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.RewardAndPunishID == recordId
+ select new SankuSafetyReward
+ {
+ RECORD_ID = tba.RewardAndPunishID,
+ //PROJECT_CODE = pms.Pro_code.ToString(),
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ PERSONNEL_ID_NUMBER = spp.IdentityCard,
+ PERSONNEL_NAME = spp.PersonName,
+ REWARD_DATE = (DateTime)tba.Date,
+ REWARD_TYPE = tba.Type == 1 ? "奖励" : "处罚",
+ REWARD_UNIT_ID = bu.MasterAdOrgCode,
+ REWARD_UNIT_CODE = bu.CollCropCode,
+ REWARD_UNIT_NAME = bu.UnitName,
+ REWARD_CONTENT = tba.Description,
+ //REWARD_AMOUNT = (decimal)tba.Money,
+ REWARD_AMOUNT = SafetyRewardMoneyConvertValue(tba.Type, (decimal)tba.Money),
+ REWARD_LEVEL = SafetyRewardType(tba.Type, tba.RewardAndPunishType),
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ //UPDATE_TIME = (DateTime)tba.CompileDate,
+ //CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ List errMsgs = new List();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.REWARD_UNIT_ID) && string.IsNullOrWhiteSpace(model.REWARD_UNIT_CODE))
+ {
+ errMsgs.Add("奖惩单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.REWARD_UNIT_ID) && !string.IsNullOrWhiteSpace(model.REWARD_UNIT_CODE) && model.REWARD_UNIT_CODE.Length != 18)
+ {
+ errMsgs.Add("奖惩单位未关联主数据组织且统一社会信用代码异常");
+ }
+
+ if (!string.IsNullOrWhiteSpace(model.PERSONNEL_ID_NUMBER) && model.PERSONNEL_ID_NUMBER.Length != 18)
+ {
+ errMsgs.Add("奖惩人员身份证异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (errMsgs.Any())
+ {
+ message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ else
+ {
+ var exist = db.SANKU_SAFETY_REWARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ exist.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ exist.REWARD_DATE = model.REWARD_DATE;
+ exist.REWARD_TYPE = model.REWARD_TYPE;
+ exist.REWARD_UNIT_ID = model.REWARD_UNIT_ID;
+ exist.REWARD_UNIT_CODE = model.REWARD_UNIT_CODE;
+ exist.REWARD_UNIT_NAME = model.REWARD_UNIT_NAME;
+ exist.REWARD_CONTENT = model.REWARD_CONTENT;
+ exist.REWARD_AMOUNT = model.REWARD_AMOUNT;
+ exist.REWARD_LEVEL = model.REWARD_LEVEL;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_SAFETY_REWARD();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ newModel.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ newModel.REWARD_DATE = model.REWARD_DATE;
+ newModel.REWARD_TYPE = model.REWARD_TYPE;
+ newModel.REWARD_UNIT_ID = model.REWARD_UNIT_ID;
+ newModel.REWARD_UNIT_CODE = model.REWARD_UNIT_CODE;
+ newModel.REWARD_UNIT_NAME = model.REWARD_UNIT_NAME;
+ newModel.REWARD_CONTENT = model.REWARD_CONTENT;
+ newModel.REWARD_AMOUNT = model.REWARD_AMOUNT;
+ newModel.REWARD_LEVEL = model.REWARD_LEVEL;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_SAFETY_REWARD.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+
+ return result;
+ }
+ }
+
+ ///
+ /// 安全奖惩处理结果
+ ///
+ /// 1:奖励、2：处罚
+ ///
+ ///
+ public static string SafetyRewardType(int? type, string value)
+ {
+ string result = string.Empty;
+ if (type != null && !string.IsNullOrWhiteSpace(value))
+ {
+ string groupId = type == 1 ? BLL.ConstValue.Group_RewardType : BLL.ConstValue.Group_PunishType;
+ var constObj = BLL.ConstValue.GetConstByConstValueAndGroupId(value, groupId);
+ if (constObj != null)
+ {
+ result = constObj.ConstText;
+ }
+ }
+ return result;
+ }
+
+ ///
+ /// 安全奖惩金额转换
+ ///
+ /// 1:奖励、2：处罚
+ /// 原始金额，可null
+ /// 转换后金额
+ public static decimal? SafetyRewardMoneyConvertValue(int? type, decimal? money)
+ {
+ // 原始值为空，直接返回null
+ if (!money.HasValue)
+ {
+ return null;
+ }
+
+ decimal val = money.Value;
+
+ switch (type)
+ {
+ case 1:
+ // 强制转为正数
+ return Math.Abs(val);
+ case 2:
+ // 强制转为负数
+ return -Math.Abs(val);
+ default:
+ // 未知类型，返回原值
+ return val;
+ }
+ }
+
+ #endregion
+
+ #region 行政处罚
+
+ ///
+ /// 更新行政处罚数据
+ ///
+ /// 行政处罚id
+ ///
+ ///
+ public static string UpdateAdminPenaltyRecord(string recordId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var models = from tba in db.Check_AdminPenalty
+ join bu in db.Base_Unit on tba.UnitId equals bu.UnitId
+ //join spp in db.SitePerson_Person on tba.RewardAndPunishMan equals spp.PersonId
+ join suc in db.Sys_User on tba.CompileMan equals suc.UserId
+ join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.PenaltyId == recordId
+ select new SankuAdminPenalty
+ {
+ RECORD_ID = tba.PenaltyId,
+ //PROJECT_CODE = pms.Pro_code.ToString(),
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ PENALTY_DATE = tba.PenaltyDate,
+ PENALTY_TYPE = tba.PenaltyType,
+ PENALTY_CONTENT = tba.PenaltyContent,
+ PENALTY_AMOUNT = tba.PenaltyAmount,
+ PENALTY_AUTHORITY = tba.PenaltyAuthority,
+ PENALTY_STATUS = tba.PenaltyStatus,
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ //UPDATE_TIME = (DateTime)tba.CompileDate,
+ //CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ List errMsgs = new List();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ errMsgs.Add("处罚单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ errMsgs.Add("处罚单位未关联主数据组织且统一社会信用代码异常");
+ }
+
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (errMsgs.Any())
+ {
+ message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ else
+ {
+ var exist = db.SANKU_ADMIN_PENALTY.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.PENALTY_DATE = model.PENALTY_DATE;
+ exist.PENALTY_TYPE = model.PENALTY_TYPE;
+ exist.PENALTY_CONTENT = model.PENALTY_CONTENT;
+ exist.PENALTY_AMOUNT = model.PENALTY_AMOUNT;
+ exist.PENALTY_AUTHORITY = model.PENALTY_AUTHORITY;
+ exist.PENALTY_STATUS = model.PENALTY_STATUS;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_ADMIN_PENALTY();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.PENALTY_DATE = model.PENALTY_DATE;
+ newModel.PENALTY_TYPE = model.PENALTY_TYPE;
+ newModel.PENALTY_CONTENT = model.PENALTY_CONTENT;
+ newModel.PENALTY_AMOUNT = model.PENALTY_AMOUNT;
+ newModel.PENALTY_AUTHORITY = model.PENALTY_AUTHORITY;
+ newModel.PENALTY_STATUS = model.PENALTY_STATUS;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_ADMIN_PENALTY.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+
+ return result;
+ }
+ }
+
+ #endregion
+
+ #region 隐患记录
+
+ ///
+ /// 更新隐患记录数据
+ ///
+ /// 隐患整改单id
+ ///
+ ///
+ public static string UpdateHazardRecord(string noticeId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ List errMsgs = new List();
+ var list = db.Check_RectifyNoticesItem.Where(x => x.RectifyNoticesId == noticeId).ToList();
+ if (list.Any())
+ {
+ foreach (var obj in list)
+ {
+ int err = 0;
+ var models = from tba in db.Check_RectifyNoticesItem
+ join tbb in db.Check_RectifyNotices on tba.RectifyNoticesId equals tbb.RectifyNoticesId
+ join bu in db.Base_Unit on tbb.UnitId equals bu.UnitId
+ join suzg in db.Sys_User on tbb.DutyPersonId equals suzg.UserId
+ join suc in db.Sys_User on tbb.CompleteManId equals suc.UserId
+ join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.RectifyNoticesItemId == obj.RectifyNoticesItemId
+ select new SankuHazard
+ {
+ RECORD_ID = tba.RectifyNoticesItemId,
+ //PROJECT_CODE = pms.Pro_code.ToString(),
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ RESPONSIBLE_PERSONNEL_ID_NUMBER = suzg.IdentityCard,
+ RESPONSIBLE_PERSONNEL_NAME = suzg.UserName,
+ RECTIFIER_PERSONNEL_ID_NUMBER = suzg.IdentityCard,
+ RECTIFIER_PERSONNEL_NAME = suzg.UserName,
+ DISCOVERY_DATE = tbb.CheckedDate == null ? DateTime.Now : (DateTime)tbb.CheckedDate,
+ HAZARD_TYPE = HazardType(tba.RectifyId),
+ HAZARD_LEVEL = HazardLevel(tbb.HiddenHazardType),
+ HAZARD_CONTENT = tba.WrongContent,
+ RECTIFICATION_STATUS = HazardState(tbb.States),
+ RECTIFICATION_DEADLINE_ID = tba.LimitTime == null ? DateTime.Now.AddDays(7) : (DateTime)tba.LimitTime,
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ //UPDATE_TIME = (DateTime)tba.CompileDate,
+ //CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ err++;
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ err++;
+ errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ err++;
+ errMsgs.Add("受检单位单位未关联主数据组织且统一社会信用代码异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (err > 0)
+ {
+ continue;
+ }
+ else
+ {
+ var exist = db.SANKU_HAZARD.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER;
+ exist.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME;
+ exist.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER;
+ exist.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME;
+ exist.DISCOVERY_DATE = model.DISCOVERY_DATE;
+ exist.HAZARD_TYPE = model.HAZARD_TYPE;
+ exist.HAZARD_LEVEL = model.HAZARD_LEVEL;
+ exist.HAZARD_CONTENT = model.HAZARD_CONTENT;
+ exist.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS;
+ exist.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_HAZARD();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.RESPONSIBLE_PERSONNEL_ID_NUMBER = model.RESPONSIBLE_PERSONNEL_ID_NUMBER;
+ newModel.RESPONSIBLE_PERSONNEL_NAME = model.RESPONSIBLE_PERSONNEL_NAME;
+ newModel.RECTIFIER_PERSONNEL_ID_NUMBER = model.RECTIFIER_PERSONNEL_ID_NUMBER;
+ newModel.RECTIFIER_PERSONNEL_NAME = model.RECTIFIER_PERSONNEL_NAME;
+ newModel.DISCOVERY_DATE = model.DISCOVERY_DATE;
+ newModel.HAZARD_TYPE = model.HAZARD_TYPE;
+ newModel.HAZARD_LEVEL = model.HAZARD_LEVEL;
+ newModel.HAZARD_CONTENT = model.HAZARD_CONTENT;
+ newModel.RECTIFICATION_STATUS = model.RECTIFICATION_STATUS;
+ newModel.RECTIFICATION_DEADLINE_ID = model.RECTIFICATION_DEADLINE_ID;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_HAZARD.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+ }
+
+ errMsgs = errMsgs.Distinct().ToList();
+ if (errMsgs.Any())
+ {
+ message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ }
+ //else
+ //{
+ // message = $"不更新三库，整改单无隐患明细";
+ //}
+ return result;
+ }
+ }
+
+ ///
+ /// 隐患状态
+ ///
+ ///
+ ///
+ public static string HazardState(string state)
+ {
+ string result = string.Empty;
+ if (!string.IsNullOrWhiteSpace(state))
+ {
+ switch (state)
+ {
+ //case "1":
+ // result = "待提交";
+ // break;
+ case "2":
+ result = "未整改";
+ break;
+ case "3":
+ result = "整改中";
+ break;
+ case "4":
+ result = "已整改";
+ break;
+ case "5":
+ result = "已验收";
+ break;
+ default:
+ result = "未整改";
+ break;
+ }
+ }
+ return result;
+ }
+
+ ///
+ /// 隐患等级
+ ///
+ ///
+ ///
+ public static string HazardLevel(string type)
+ {
+ string result = string.Empty;
+ if (!string.IsNullOrWhiteSpace(type))
+ {
+ switch (type)
+ {
+ case "1":
+ result = "一般隐患";
+ break;
+ case "2":
+ result = "较大隐患";
+ break;
+ case "3":
+ result = "重大隐患";
+ break;
+ //case "4":
+ // result = "特别重大隐患";
+ // break;
+ default:
+ result = "一般隐患";
+ break;
+ }
+ }
+ return result;
+ }
+
+ ///
+ /// 隐患类型
+ ///
+ ///
+ ///
+ public static string HazardType(string rectifyId)
+ {
+ string result = string.Empty;
+ if (!string.IsNullOrWhiteSpace(rectifyId))
+ {
+ var db = Funs.DB;
+ var obj = db.Technique_Rectify.Where(x => x.SupRectifyId == "0" && x.RectifyId == rectifyId).FirstOrDefault();
+ if (obj != null)
+ {
+ result = obj.RectifyName;
+ }
+ }
+ return result;
+ }
+
+ #endregion
+
+ #region 教育培训
+
+ ///
+ /// 更新教育培训数据
+ ///
+ /// 教育培训id
+ ///
+ ///
+ public static string UpdateTrainingRecord(string trainingId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ List errMsgs = new List();
+ var list = db.EduTrain_TrainRecordDetail.Where(x => x.TrainingId == trainingId).ToList();
+ if (list.Any())
+ {
+ foreach (var obj in list)
+ {
+ int err = 0;
+ var models = from tba in db.EduTrain_TrainRecordDetail
+ join tbb in db.EduTrain_TrainRecord on tba.TrainingId equals tbb.TrainingId
+ join bu in db.Base_Unit on tbb.UnitIds equals bu.UnitId
+ join spp in db.SitePerson_Person on tba.PersonId equals spp.PersonId
+ join spu in db.Base_Unit on spp.UnitId equals spu.UnitId
+ join bty in db.Base_TrainType on tbb.TrainTypeId equals bty.TrainTypeId
+ join suc in db.Sys_User on tbb.CompileMan equals suc.UserId
+ join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.TrainDetailId == obj.TrainDetailId
+ select new SankuTraining
+ {
+ RECORD_ID = tba.TrainDetailId,
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = spu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = spu.CollCropCode,
+ SUBCONTRACTOR_NAME = spu.UnitName,
+ PERSONNEL_ID_NUMBER = spp.IdentityCard,
+ PERSONNEL_NAME = spp.PersonName,
+ TRAINING_DATE = tbb.TrainStartDate == null ? DateTime.Now : (DateTime)tbb.TrainStartDate,
+ TRAINING_NAME = TrainingName(tbb.TrainTitle, bty.TrainTypeName),
+ TRAINING_TYPE = bty.TrainTypeName,
+ TRAINING_DURATION = tbb.TeachHour,
+ TRAINING_ORGANIZER = bu.UnitName,
+ TRAINING_CONTENT = TrainingContent(tbb.TrainContent, bty.TrainTypeName),
+ TRAINING_RESULT = TrainingResult(tba.CheckResult),
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ //UPDATE_TIME = (DateTime)tba.CompileDate,
+ //CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ err++;
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ err++;
+ errMsgs.Add("人员所属单位单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ err++;
+ errMsgs.Add("人员所属单位单位未关联主数据组织且统一社会信用代码异常");
+ }
+ if (!string.IsNullOrWhiteSpace(model.PERSONNEL_ID_NUMBER) && model.PERSONNEL_ID_NUMBER.Length != 18)
+ {
+ err++;
+ errMsgs.Add($"培训人员{model.PERSONNEL_NAME}身份证异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (err > 0)
+ {
+ continue;
+ }
+ else
+ {
+ var exist = db.SANKU_TRAINING.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ exist.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ exist.TRAINING_DATE = model.TRAINING_DATE;
+ exist.TRAINING_NAME = model.TRAINING_NAME;
+ exist.TRAINING_TYPE = model.TRAINING_TYPE;
+ exist.TRAINING_DURATION = model.TRAINING_DURATION;
+ exist.TRAINING_ORGANIZER = model.TRAINING_ORGANIZER;
+ exist.TRAINING_CONTENT = model.TRAINING_CONTENT;
+ exist.TRAINING_RESULT = model.TRAINING_RESULT;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_TRAINING();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ newModel.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ newModel.TRAINING_DATE = model.TRAINING_DATE;
+ newModel.TRAINING_NAME = model.TRAINING_NAME;
+ newModel.TRAINING_TYPE = model.TRAINING_TYPE;
+ newModel.TRAINING_DURATION = model.TRAINING_DURATION;
+ newModel.TRAINING_ORGANIZER = model.TRAINING_ORGANIZER;
+ newModel.TRAINING_CONTENT = model.TRAINING_CONTENT;
+ newModel.TRAINING_RESULT = model.TRAINING_RESULT;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_TRAINING.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+ }
+
+ errMsgs = errMsgs.Distinct().ToList();
+ if (errMsgs.Any())
+ {
+ message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ }
+ //else
+ //{
+ // message = $"不更新三库，整改单无隐患明细";
+ //}
+ return result;
+ }
+ }
+
+ ///
+ /// 培训名称
+ ///
+ ///
+ ///
+ ///
+ public static string TrainingName(string title, string type)
+ {
+ string result = type;
+ if (!string.IsNullOrWhiteSpace(title))
+ {
+ result = title;
+ }
+ return result;
+ }
+
+ ///
+ /// 培训内容
+ ///
+ ///
+ ///
+ ///
+ public static string TrainingContent(string content, string type)
+ {
+ string result = type;
+ if (!string.IsNullOrWhiteSpace(content))
+ {
+ result = content;
+ }
+ return result;
+ }
+
+ ///
+ /// 培训结果
+ ///
+ ///
+ ///
+ public static string TrainingResult(bool? value)
+ {
+ string result = string.Empty;
+ switch (value)
+ {
+ case true:
+ result = "通过";
+ break;
+ case false:
+ result = "未通过";
+ break;
+ default:
+ result = "缺考";
+ break;
+ }
+ return result;
+ }
+
+ #endregion
+
+ #region 考试考核
+
+ ///
+ /// 更新考试考核数据
+ ///
+ /// 考试计划id
+ ///
+ ///
+ public static string UpdateExaminationRecord(string testPlanId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ List errMsgs = new List();
+ var list = db.Training_TestRecord.Where(x => x.TestPlanId == testPlanId).ToList();
+ if (list.Any())
+ {
+ foreach (var obj in list)
+ {
+ int err = 0;
+ var models = from tba in db.Training_TestRecord
+ join tbb in db.Training_TestPlan on tba.TestPlanId equals tbb.TestPlanId
+ join spp in db.SitePerson_Person on tba.TestManId equals spp.PersonId
+ join bu in db.Base_Unit on spp.UnitId equals bu.UnitId
+ join suc in db.Sys_User on tbb.PlanManId equals suc.UserId
+ join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.TestRecordId == obj.TestRecordId
+ select new SankuExamination
+ {
+ RECORD_ID = tba.TestRecordId,
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ PERSONNEL_ID_NUMBER = spp.IdentityCard,
+ PERSONNEL_NAME = spp.PersonName,
+ EXAM_DATE = tbb.TestEndTime == null ? DateTime.Now : (DateTime)tbb.TestEndTime,
+ EXAM_NAME = tbb.PlanName,
+ EXAM_TYPE = "理论考试",
+ EXAM_SCORE = tba.TestScores,
+ EXAM_RESULT = ExamResult(tba.TestScores),
+ EXAM_ORGANIZER = tbb.UnitNames,
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ //UPDATE_TIME = (DateTime)tba.CompileDate,
+ //CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ err++;
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ err++;
+ errMsgs.Add("人员所属单位单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ err++;
+ errMsgs.Add("人员所属单位单位未关联主数据组织且统一社会信用代码异常");
+ }
+ if (!string.IsNullOrWhiteSpace(model.PERSONNEL_ID_NUMBER) && model.PERSONNEL_ID_NUMBER.Length != 18)
+ {
+ err++;
+ errMsgs.Add($"考试人员{model.PERSONNEL_NAME}身份证异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+
+ if (err > 0)
+ {
+ continue;
+ }
+ else
+ {
+ var exist = db.SANKU_EXAMINATION.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ exist.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ exist.EXAM_DATE = model.EXAM_DATE;
+ exist.EXAM_NAME = model.EXAM_NAME;
+ exist.EXAM_TYPE = model.EXAM_TYPE;
+ exist.EXAM_SCORE = model.EXAM_SCORE;
+ exist.EXAM_RESULT = model.EXAM_RESULT;
+ exist.EXAM_ORGANIZER = model.EXAM_ORGANIZER;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_EXAMINATION();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ newModel.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ newModel.EXAM_DATE = model.EXAM_DATE;
+ newModel.EXAM_NAME = model.EXAM_NAME;
+ newModel.EXAM_TYPE = model.EXAM_TYPE;
+ newModel.EXAM_SCORE = model.EXAM_SCORE;
+ newModel.EXAM_RESULT = model.EXAM_RESULT;
+ newModel.EXAM_ORGANIZER = model.EXAM_ORGANIZER;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_EXAMINATION.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+ }
+ errMsgs = errMsgs.Distinct().ToList();
+ if (errMsgs.Any())
+ {
+ message = $"部分无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ }
+ return result;
+ }
+ }
+
+ ///
+ /// 更新考试考核数据【单条】
+ ///
+ /// 考试考核id
+ ///
+ ///
+ public static string UpdateExaminationRecordItem(string testRecordId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ List errMsgs = new List();
+
+ int err = 0;
+ var models = from tba in db.Training_TestRecord
+ join tbb in db.Training_TestPlan on tba.TestPlanId equals tbb.TestPlanId
+ join spp in db.SitePerson_Person on tba.TestManId equals spp.PersonId
+ join bu in db.Base_Unit on spp.UnitId equals bu.UnitId
+ join suc in db.Sys_User on tbb.PlanManId equals suc.UserId
+ join bp in db.Base_Project on tbb.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.TestRecordId == testRecordId
+ select new SankuExamination
+ {
+ RECORD_ID = tba.TestRecordId,
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ PERSONNEL_ID_NUMBER = spp.IdentityCard,
+ PERSONNEL_NAME = spp.PersonName,
+ EXAM_DATE = tbb.TestEndTime == null ? DateTime.Now : (DateTime)tbb.TestEndTime,
+ EXAM_NAME = tbb.PlanName,
+ EXAM_TYPE = "理论考试",
+ EXAM_SCORE = tba.TestScores,
+ EXAM_RESULT = ExamResult(tba.TestScores),
+ EXAM_ORGANIZER = tbb.UnitNames,
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ //UPDATE_TIME = (DateTime)tba.CompileDate,
+ //CREATE_TIME = (DateTime)tba.CompileDate
+ };
+ var model = models.ToList().FirstOrDefault();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ err++;
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ err++;
+ errMsgs.Add("人员所属单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ err++;
+ errMsgs.Add("人员所属单位未关联主数据组织且统一社会信用代码异常");
+ }
+ if (!string.IsNullOrWhiteSpace(model.PERSONNEL_ID_NUMBER) && model.PERSONNEL_ID_NUMBER.Length != 18)
+ {
+ errMsgs.Add($"考试人员{model.PERSONNEL_NAME}身份证异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (errMsgs.Any())
+ {
+ message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ else
+ {
+ var exist = db.SANKU_EXAMINATION.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ exist.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ exist.EXAM_DATE = model.EXAM_DATE;
+ exist.EXAM_NAME = model.EXAM_NAME;
+ exist.EXAM_TYPE = model.EXAM_TYPE;
+ exist.EXAM_SCORE = model.EXAM_SCORE;
+ exist.EXAM_RESULT = model.EXAM_RESULT;
+ exist.EXAM_ORGANIZER = model.EXAM_ORGANIZER;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_EXAMINATION();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ newModel.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ newModel.EXAM_DATE = model.EXAM_DATE;
+ newModel.EXAM_NAME = model.EXAM_NAME;
+ newModel.EXAM_TYPE = model.EXAM_TYPE;
+ newModel.EXAM_SCORE = model.EXAM_SCORE;
+ newModel.EXAM_RESULT = model.EXAM_RESULT;
+ newModel.EXAM_ORGANIZER = model.EXAM_ORGANIZER;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_EXAMINATION.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+ return result;
+ }
+ }
+
+ ///
+ /// 考试结果
+ ///
+ ///
+ ///
+ public static string ExamResult(decimal? value)
+ {
+ string result = string.Empty;
+ if (value != null)
+ {
+ if (value >= 80)
+ {
+ result = "通过";
+ }
+ else if (value == 0)
+ {
+ result = "缺考";
+ }
+ else
+ {
+ result = "未通过";
+ }
+ }
+ else
+ {
+ result = "缺考";
+ }
+ return result;
+ }
+
+ #endregion
+
+ #region 危大工程
+
+ ///
+ /// 更新危大工程数据
+ ///
+ /// 危大工程id
+ ///
+ ///
+ public static string UpdateDangerousEngineeringRecord(string hazardId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var models = from tba in db.Solution_LargerHazard
+ join bu in db.Base_Unit on tba.UnitId equals bu.UnitId
+ join spp in db.SitePerson_Person on tba.StandbyPersonnelId equals spp.PersonId
+ join suc in db.Sys_User on tba.RecardMan equals suc.UserId
+ join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ where tba.HazardId == hazardId
+ select new SankuDangerousEngineering
+ {
+ RECORD_ID = tba.HazardId,
+ //PROJECT_CODE = pms.Pro_code.ToString(),
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ ENGINEERING_DATE = tba.ExpectedTime == null ? DateTime.Now : (DateTime)tba.ExpectedTime,
+ ENGINEERING_NAME = tba.HazardName,
+ ENGINEERING_TYPE = LargerHazardType(tba.HazardType),
+ ENGINEERING_ADDRESS = tba.Address,
+ ENGINEERING_DESC = tba.Descriptions,
+ STANDBY_PERSONNEL_ID_NUMBER = spp.IdentityCard,
+ STANDBY_PERSONNEL_NAME = spp.PersonName,
+ SUBMITTER_ID_NUMBER = suc.IdentityCard,
+ SUBMITTER_NAME = suc.UserName,
+ UPDATE_TIME = (DateTime)tba.RecordTime,
+ CREATE_TIME = (DateTime)tba.RecordTime
+ };
+ string sql = db.GetCommand(models).CommandText;
+ var model = models.ToList().FirstOrDefault();
+ List errMsgs = new List();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ errMsgs.Add("施工单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ errMsgs.Add("施工单位未关联主数据组织且统一社会信用代码异常");
+ }
+ if (!string.IsNullOrWhiteSpace(model.STANDBY_PERSONNEL_ID_NUMBER) && model.STANDBY_PERSONNEL_ID_NUMBER.Length != 18)
+ {
+ errMsgs.Add("旁站人员身份证异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (errMsgs.Any())
+ {
+ message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ else
+ {
+ var exist = db.SANKU_DANGEROUS_ENGINEERING.Where(x => x.RECORD_ID == model.RECORD_ID).FirstOrDefault();
+ if (exist != null)
+ {
+ //更新三库
+ exist.RECORD_ID = model.RECORD_ID;
+ exist.PROJECT_CODE = model.PROJECT_CODE;
+ exist.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ exist.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ exist.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ exist.ENGINEERING_DATE = model.ENGINEERING_DATE;
+ exist.ENGINEERING_NAME = model.ENGINEERING_NAME;
+ exist.ENGINEERING_TYPE = model.ENGINEERING_TYPE;
+ exist.ENGINEERING_ADDRESS = model.ENGINEERING_ADDRESS;
+ exist.ENGINEERING_DESC = model.ENGINEERING_DESC;
+ exist.STANDBY_PERSONNEL_ID_NUMBER = model.STANDBY_PERSONNEL_ID_NUMBER;
+ exist.STANDBY_PERSONNEL_NAME = model.STANDBY_PERSONNEL_NAME;
+ //exist.SOURCE_SYSTEM_ID = model.SOURCE_SYSTEM_ID;
+ //exist.SOURCE_SYSTEM_NAME = model.SOURCE_SYSTEM_NAME;
+ exist.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ exist.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ exist.UPDATE_TIME = DateTime.Now;
+ //exist.UPDATE_TIME = model.UPDATE_TIME;
+ //exist.CREATE_TIME = model.CREATE_TIME;
+ exist.ReportDate = null;
+ }
+ else
+ {
+ //新增三库
+ var newModel = new SANKU_DANGEROUS_ENGINEERING();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ newModel.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.ENGINEERING_DATE = model.ENGINEERING_DATE;
+ newModel.ENGINEERING_NAME = model.ENGINEERING_NAME;
+ newModel.ENGINEERING_TYPE = model.ENGINEERING_TYPE;
+ newModel.ENGINEERING_ADDRESS = model.ENGINEERING_ADDRESS;
+ newModel.ENGINEERING_DESC = model.ENGINEERING_DESC;
+ newModel.STANDBY_PERSONNEL_ID_NUMBER = model.STANDBY_PERSONNEL_ID_NUMBER;
+ newModel.STANDBY_PERSONNEL_NAME = model.STANDBY_PERSONNEL_NAME;
+ //newModel.SOURCE_SYSTEM_ID = model.SOURCE_SYSTEM_ID;
+ //newModel.SOURCE_SYSTEM_NAME = model.SOURCE_SYSTEM_NAME;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = model.CREATE_TIME;
+ db.SANKU_DANGEROUS_ENGINEERING.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+ return result;
+ }
+ }
+
+
+ ///
+ /// 危大工程类型
+ ///
+ ///
+ ///
+ public static string LargerHazardType(string type)
+ {
+ string result = string.Empty;
+ if (!string.IsNullOrWhiteSpace(type))
+ {
+ var db = Funs.DB;
+ var obj = db.Sys_Const.Where(x => x.GroupId == ConstValue.Group_LargerHazardType && x.ConstValue == type).FirstOrDefault();
+ if (obj != null)
+ {
+ result = obj.ConstText;
+ }
+ }
+ else
+ {
+ result = "其它";
+ }
+ return result;
+ }
+
+
+ #endregion
+
+ #region 网格化巡查
+
+ ///
+ /// 更新网格化巡查数据
+ ///
+ /// 网格化巡查id
+ ///
+ ///
+ public static string UpdateGridPatrolRecord(string hazardId, ref string message)
+ {
+ string result = string.Empty;
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var models = from tba in db.HSSE_Hazard_HazardRegister
+ join bp in db.Base_Project on tba.ProjectId equals bp.ProjectId
+ join pms in db.Ads_pms_pro_info_build on bp.MasterSysId equals pms.Pro_id
+ join suzg in db.Sys_User on tba.CheckManId equals suzg.UserId
+ join bu in db.Base_Unit on suzg.UnitId equals bu.UnitId
+ where tba.HazardRegisterId == hazardId
+ select new SankuGridPatrol
+ {
+ RECORD_ID = tba.HazardRegisterId,
+ PROJECT_CODE = pms.Pro_code,
+ PROJECT_NAME = pms.Pro_name,
+ SUBCONTRACTOR_ID = bu.MasterAdOrgCode,
+ SUBCONTRACTOR_CODE = bu.CollCropCode,
+ SUBCONTRACTOR_NAME = bu.UnitName,
+ PERSONNEL_ID_NUMBER = suzg.IdentityCard,
+ PERSONNEL_NAME = suzg.UserName,
+ PATROL_TIME = tba.CheckTime == null ? DateTime.Now : (DateTime)tba.CheckTime,
+ PATROL_STATUS = "已完成",
+ SUBMITTER_ID_NUMBER = suzg.IdentityCard,
+ SUBMITTER_NAME = suzg.UserName,
+ UPDATE_TIME = (DateTime)tba.CheckTime,
+ CREATE_TIME = (DateTime)tba.CheckTime
+ };
+ string sql = db.GetCommand(models).CommandText;
+ var model = models.ToList().FirstOrDefault();
+ List errMsgs = new List();
+ if (model != null)
+ {
+ if (string.IsNullOrWhiteSpace(model.PROJECT_CODE))
+ {
+ errMsgs.Add("项目未关联集团主数据");
+ }
+ if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE))
+ {
+ errMsgs.Add("检查人单位未关联主数据组织且统一社会信用代码为空");
+ }
+ else if (string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_ID) && !string.IsNullOrWhiteSpace(model.SUBCONTRACTOR_CODE) && model.SUBCONTRACTOR_CODE.Length != 18)
+ {
+ errMsgs.Add("检查人单位未关联主数据组织且统一社会信用代码异常");
+ }
+ if (!string.IsNullOrWhiteSpace(model.PERSONNEL_ID_NUMBER) && model.PERSONNEL_ID_NUMBER.Length != 18)
+ {
+ errMsgs.Add("检查人身份证异常");
+ }
+ //if (!string.IsNullOrWhiteSpace(model.SUBMITTER_ID_NUMBER) && model.SUBMITTER_ID_NUMBER.Length != 18)
+ //{
+ // errMsgs.Add("填报人身份证异常");
+ //}
+ if (errMsgs.Any())
+ {
+ message = $"无法更新三库，数据异常：{string.Join(",", errMsgs)}";
+ }
+ else
+ {
+ bool isExist = false;
+ var exist = db.SANKU_GRID_PATROL.Where(x => x.PERSONNEL_ID_NUMBER == model.PERSONNEL_ID_NUMBER).OrderByDescending(x => x.PATROL_TIME).FirstOrDefault();
+ if (exist != null)
+ {
+ isExist = exist.PATROL_TIME.ToString("yyyy-MM-dd") == model.PATROL_TIME.ToString("yyyy-MM-dd");
+ }
+ if (isExist == false)
+ {
+ //新增三库
+ var newModel = new SANKU_GRID_PATROL();
+ newModel.RECORD_ID = model.RECORD_ID;
+ newModel.PROJECT_CODE = model.PROJECT_CODE;
+ newModel.PROJECT_NAME = model.PROJECT_NAME;
+ exist.SUBCONTRACTOR_ID = model.SUBCONTRACTOR_ID;
+ newModel.SUBCONTRACTOR_CODE = model.SUBCONTRACTOR_CODE;
+ newModel.SUBCONTRACTOR_NAME = model.SUBCONTRACTOR_NAME;
+ newModel.PERSONNEL_ID_NUMBER = model.PERSONNEL_ID_NUMBER;
+ newModel.PERSONNEL_NAME = model.PERSONNEL_NAME;
+ newModel.PATROL_TIME = model.PATROL_TIME;
+ newModel.PATROL_STATUS = model.PATROL_STATUS;
+ //newModel.SOURCE_SYSTEM_ID = model.SOURCE_SYSTEM_ID;
+ //newModel.SOURCE_SYSTEM_NAME = model.SOURCE_SYSTEM_NAME;
+ newModel.SUBMITTER_ID_NUMBER = model.SUBMITTER_ID_NUMBER;
+ newModel.SUBMITTER_NAME = model.SUBMITTER_NAME;
+ newModel.UPDATE_TIME = DateTime.Now;
+ //newModel.UPDATE_TIME = model.UPDATE_TIME;
+ newModel.CREATE_TIME = model.CREATE_TIME;
+ db.SANKU_GRID_PATROL.InsertOnSubmit(newModel);
+ }
+ db.SubmitChanges();
+ }
+ }
+ return result;
+ }
+ }
+
+ #endregion
+
+ #endregion
+
+ #region 汇总上报
+
+ #region 事故事件
+
+ ///
+ /// 汇总上报事故事件数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportAccidentRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取事故事件数据
+ List reportDatas = (from x in db.SANKU_ACCIDENT_RECORD where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的事故事件数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportAccidentRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportAccident
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报事故事件数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报事故事件数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_ACCIDENT_RECORD.FirstOrDefault(e => e.ACCIDENT_RECORD_ID == o.ACCIDENT_RECORD_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ //message = $"成功上报事故事件数据{total}条！";
+
+ //var getIds = Funs.GetStrListByStr(obj["data"].ToString(), ',');
+ //if (getIds.Any())
+ //{
+ // succ = getIds.Count;
+ // var dateNow = DateTime.Now;
+ // foreach (var id in getIds)
+ // {
+ // var item = db.SANKU_ACCIDENT_RECORD.FirstOrDefault(e => e.ACCIDENT_ID == id);
+ // if (item != null)
+ // {
+ // item.ReportDate = dateNow;
+ // db.SubmitChanges();
+ // }
+ // }
+ //}
+ //message = $"成功上报事故事件数据{succ}/{total}条！";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+
+ ////记录上报结果日志
+ //Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ //newModel.OPTYPE = opType;
+ //newModel.CONTENT = "上报事故事件数据";
+ //newModel.RESULT = code == "1" ? "成功" : "失败";
+ //newModel.DETAIL = message;
+ //newModel.OPERATOR = userName;
+ //newModel.CREATE_TIME = DateTime.Now;
+ //db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ //db.SubmitChanges();
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报事故事件数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 违章作业
+
+ ///
+ /// 汇总上报违章作业数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportViolationRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取违章作业数据
+ List reportDatas = (from x in db.SANKU_VIOLATION where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的违章作业数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportViolationRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportViolation
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报违章作业数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报违章作业数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_VIOLATION.FirstOrDefault(e => e.VIOLATION_ID == o.VIOLATION_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报违章作业数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 安全奖惩
+
+ ///
+ /// 汇总上报安全奖惩数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportSafetyRewardRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取安全奖惩数据
+ List reportDatas = (from x in db.SANKU_SAFETY_REWARD where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的安全奖惩数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportSafetyRewardRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportSafetyReward
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报安全奖惩数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报安全奖惩数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_SAFETY_REWARD.FirstOrDefault(e => e.REWARD_ID == o.REWARD_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报安全奖惩数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 行政处罚
+
+ ///
+ /// 汇总上报行政处罚数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportAdminPenaltyRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取行政处罚数据
+ List reportDatas = (from x in db.SANKU_ADMIN_PENALTY where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的行政处罚数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportAdminPenaltyRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportAdminPenalty
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报行政处罚数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报行政处罚数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_ADMIN_PENALTY.FirstOrDefault(e => e.PENALTY_ID == o.PENALTY_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报行政处罚数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 隐患记录
+
+ ///
+ /// 汇总上报隐患记录数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportHazardRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取隐患记录数据
+ List reportDatas = (from x in db.SANKU_HAZARD where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的隐患记录数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportHazardRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportHazard
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报隐患记录数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报隐患记录数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_HAZARD.FirstOrDefault(e => e.HAZARD_ID == o.HAZARD_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报隐患记录数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 教育培训
+
+ ///
+ /// 汇总上报教育培训数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportTrainingRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取教育培训数据
+ List reportDatas = (from x in db.SANKU_TRAINING where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的教育培训数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportTrainingRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportTraining
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报教育培训数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报教育培训数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_TRAINING.FirstOrDefault(e => e.TRAINING_ID == o.TRAINING_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报教育培训数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 考试考核
+
+ ///
+ /// 汇总上报考试考核数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportExaminationRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取考试考核数据
+ List reportDatas = (from x in db.SANKU_EXAMINATION where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的考试考核数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportExaminationRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportExamination
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报考试考核数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报考试考核数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_EXAMINATION.FirstOrDefault(e => e.EXAMINATION_ID == o.EXAMINATION_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报考试考核数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 危大工程
+
+ ///
+ /// 汇总上报危大工程数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportDangerousEngineeringRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取危大工程数据
+ List reportDatas = (from x in db.SANKU_DANGEROUS_ENGINEERING where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的危大工程数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportDangerousEngineeringRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportDangerousEngineering
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报危大工程数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报危大工程数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_DANGEROUS_ENGINEERING.FirstOrDefault(e => e.DANGEROUS_ID == o.DANGEROUS_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报危大工程数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #region 网格化巡查
+
+ ///
+ /// 汇总上报网格化巡查数据
+ ///
+ /// 操作人，为空：定时任务自动上报
+ ///
+ ///
+ public static string ReportGridPatrolRecords(string userName, ref string message)
+ {
+ string code = "0";
+ string result = "失败";
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ var thisUnit = CommonService.GetIsThisUnit();
+ string filePath = Funs.SGGLUrl;
+
+ //获取网格化巡查数据
+ List reportDatas = (from x in db.SANKU_GRID_PATROL where x.ReportDate == null select x).ToList();
+ int total = reportDatas.Count();
+ int succ = 0;
+
+ if (!reportDatas.Any())
+ {
+ message = "暂无需要上报的网格化巡查数据！无需上报！";
+ return code;
+ }
+
+ #region 上报数据
+
+ string opType = !string.IsNullOrWhiteSpace(userName) ? "手动上报" : "自动上报";
+ userName = !string.IsNullOrWhiteSpace(userName) ? userName : "定时任务";
+ try
+ {
+ string baseurl = $"{SysConstSetService.CNCECPath}/api/SanKu/ReportGridPatrolRecords";
+ string contenttype = "application/json;charset=unicode";
+ Hashtable newToken = new Hashtable
+ {
+ { "token", ServerService.GetToken().Token }
+ };
+ var pushData = new SankuReportGridPatrol
+ {
+ CollCropCode = thisUnit.CollCropCode,//分包单位社会统一信用码
+ UnitId = thisUnit.UnitId,//分包单位Id
+ UnitName = thisUnit.UnitName,//分包单位名称
+ OpType = opType,
+ Operator = userName,
+ Items = reportDatas,
+ };
+ var pushContent = JsonConvert.SerializeObject(pushData);
+
+ //ErrLogInfo.WriteLog($"【三库：汇总上报网格化巡查数据】：{pushContent}");
+ var strJosn = APIGetHttpService.Http(baseurl, "Post", contenttype, newToken, pushContent);
+ if (!string.IsNullOrEmpty(strJosn))
+ {
+ //ErrLogInfo.WriteLog($"【三库：汇总上报网格化巡查数据】：{strJosn}");
+ JObject obj = JObject.Parse(strJosn);
+ code = obj["code"].ToString();
+ message = obj["message"].ToString();
+ if (code == "1")
+ {
+ var dateNow = DateTime.Now;
+ foreach (var o in reportDatas)
+ {
+ var item = db.SANKU_GRID_PATROL.FirstOrDefault(e => e.PATROL_ID == o.PATROL_ID);
+ if (item != null)
+ {
+ item.ReportDate = dateNow;
+ db.SubmitChanges();
+ }
+ }
+ result = "成功";
+ }
+ }
+ else
+ {
+ message = "无返回结果";
+ }
+ }
+ catch (Exception ex)
+ {
+ result = "异常";
+ message = JsonConvert.SerializeObject(ex);
+ //message = ex.Message.ToString();
+ }
+
+ //记录上报结果日志
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = opType;
+ newModel.CONTENT = "上报网格化巡查数据";
+ newModel.RESULT = result;
+ newModel.DETAIL = message;
+ newModel.OPERATOR = userName;
+ newModel.CREATE_TIME = DateTime.Now;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+
+ #endregion
+
+ return code;
+ }
+ }
+
+ #endregion
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/BLL/SanKu/SanKuReportLogService.cs b/SUBQHSE/BLL/SanKu/SanKuReportLogService.cs
new file mode 100644
index 0000000..364b30f
--- /dev/null
+++ b/SUBQHSE/BLL/SanKu/SanKuReportLogService.cs
@@ -0,0 +1,42 @@
+using Model;
+using System.Collections.Generic;
+using System.Linq;
+namespace BLL
+{
+ ///
+ /// 三库业务数据上报记录
+ ///
+ public static class SanKuReportLogService
+ {
+ ///
+ /// 获取三库业务数据上报记录
+ ///
+ ///
+ ///
+ public static List GetReportLogList()
+ {
+ var db = Funs.DB;
+ var list = (from x in db.SANKU_REPORT_LOG orderby x.CREATE_TIME descending select x ).ToList();
+ return list;
+ }
+
+ ///
+ /// 添加业务数据上报记录日志
+ ///
+ ///
+ public static void AddReportLog(Model.SANKU_REPORT_LOG model)
+ {
+ Model.SUBQHSEDB db = Funs.DB;
+ Model.SANKU_REPORT_LOG newModel = new Model.SANKU_REPORT_LOG();
+ newModel.OPTYPE = model.OPTYPE;
+ newModel.CONTENT = model.CONTENT;
+ newModel.RESULT = model.RESULT;
+ newModel.DETAIL = model.DETAIL;
+ newModel.OPERATOR = model.OPERATOR;
+ newModel.CREATE_TIME = model.CREATE_TIME;
+ db.SANKU_REPORT_LOG.InsertOnSubmit(newModel);
+ db.SubmitChanges();
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/BLL/SysManage/UnitService.cs b/SUBQHSE/BLL/SysManage/UnitService.cs
index 4b99f8e..a4529f4 100644
--- a/SUBQHSE/BLL/SysManage/UnitService.cs
+++ b/SUBQHSE/BLL/SysManage/UnitService.cs
@@ -108,6 +108,9 @@ namespace BLL
LinkMobile = unit.LinkMobile,
CollCropStatus = unit.CollCropStatus,
RealNamePushTime = null,
+ MasterAdOrgCode = unit.MasterAdOrgCode,
+ MasterAdOrgName = unit.MasterAdOrgName,
+
};
db.Base_Unit.InsertOnSubmit(newUnit);
db.SubmitChanges();
@@ -144,6 +147,9 @@ namespace BLL
newUnit.CollCropStatus = unit.CollCropStatus;
newUnit.RealNamePushTime = null;
newUnit.IsThisUnit = unit.IsThisUnit;
+ newUnit.MasterAdOrgCode = unit.MasterAdOrgCode;
+ newUnit.MasterAdOrgName = unit.MasterAdOrgName;
+
db.SubmitChanges();
}
}
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx
new file mode 100644
index 0000000..25fd9e4
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx
@@ -0,0 +1,165 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AdminPenalty.aspx.cs" Inherits="FineUIPro.Web.CQMS.Check.AdminPenalty" %>
+
+<%@ Register Src="~/Controls/UnitProjectTControl.ascx" TagName="UnitProjectTControl" TagPrefix="uc1" %>
+
+
+
+
+
+
+
+
+ 行政处罚
+
+
+
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx.cs
new file mode 100644
index 0000000..8560903
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx.cs
@@ -0,0 +1,348 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.CQMS.Check
+{
+ public partial class AdminPenalty : PageBase
+ {
+ ///
+ /// 项目id
+ ///
+ public string ProjectId
+ {
+ get { return (string)ViewState["ProjectId"]; }
+ set { ViewState["ProjectId"] = value; }
+ }
+ ///
+ /// 1：安全、2：质量
+ ///
+ public string SysTemType
+ {
+ get { return (string)ViewState["SysTemType"]; }
+ set { ViewState["SysTemType"] = value; }
+ }
+ ///
+ /// 菜单Id
+ ///
+ public string MenuId
+ {
+ get { return (string)ViewState["MenuId"]; }
+ set { ViewState["MenuId"] = value; }
+ }
+
+ ///
+ /// 页面加载
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.SysTemType = Request.Params["type"] ?? "1";
+ this.MenuId = BLL.Const.AdminPenaltyMenuId;
+
+ this.ProjectId = this.CurrUser.LoginProjectId;
+ if (!string.IsNullOrEmpty(Request.Params["projectId"]) &&
+ Request.Params["projectId"] != this.CurrUser.LoginProjectId)
+ {
+ this.ProjectId = Request.Params["projectId"];
+ }
+
+ this.ucTree.UnitId = this.CurrUser.UnitId;
+ this.ucTree.ProjectId = this.ProjectId;
+ if (!string.IsNullOrEmpty(this.ProjectId))
+ {
+ this.panelLeftRegion.Hidden = true;
+ ////权限按钮方法
+ this.GetButtonPower();
+ }
+ UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, "", true);
+
+ btnNew.OnClientClick = Window1.GetShowReference(String.Format("AdminPenaltyEdit.aspx?type={0}", this.SysTemType, "编辑 - ")) + "return false;";
+ // 绑定表格
+ BindGrid();
+ }
+ }
+
+ ///
+ /// 公司级树加载
+ ///
+ ///
+ ///
+ protected void changeTree(object sender, EventArgs e)
+ {
+ this.ProjectId = this.ucTree.ProjectId;
+ this.GetButtonPower();
+ if (string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
+ {
+ btnNew.Hidden = true;
+ }
+
+ this.BindGrid();
+ }
+ protected void TextBox_TextChanged(object sender, EventArgs e)
+ {
+ BindGrid();
+ }
+
+ ///
+ /// 绑定数据
+ ///
+ public void BindGrid()
+ {
+ if (string.IsNullOrEmpty(this.ProjectId))
+ {
+ return;
+ }
+
+ DataTable tb = ChecklistData();
+
+ // 2.获取当前分页数据
+ //var table = this.GetPagedDataTable(Grid1, tb1);
+
+ Grid1.RecordCount = tb.Rows.Count;
+ tb = GetFilteredTable(Grid1.FilteredData, tb);
+ var table = this.GetPagedDataTable(Grid1, tb);
+
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ }
+
+
+ protected DataTable ChecklistData()
+ {
+ string strSql = @" SELECT * FROM dbo.Check_AdminPenalty WHERE ProjectId=@ProjectId ";
+
+ List listStr = new List();
+ listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
+
+ if (!string.IsNullOrEmpty(this.txtContent.Text.Trim()))
+ {
+ strSql += " AND PenaltyContent LIKE @Content";
+ listStr.Add(new SqlParameter("@Content", "%" + this.txtContent.Text.Trim() + "%"));
+ }
+ if (this.drpUnit.SelectedValue != Const._Null)
+ {
+ strSql += " AND UnitId = @Unit";
+ listStr.Add(new SqlParameter("@Unit", drpUnit.SelectedValue));
+ }
+ if (!string.IsNullOrWhiteSpace(SysTemType))
+ {
+ strSql += " AND SysType = @SysType";
+ listStr.Add(new SqlParameter("@SysType", SysTemType));
+ }
+ string type = this.drpPenaltyType.SelectedValue.Trim();
+ string status = this.drpPenaltyStatus.SelectedValue.Trim();
+ if (!string.IsNullOrWhiteSpace(type))
+ {
+ strSql += " AND PenaltyType = @Type";
+ listStr.Add(new SqlParameter("@Type", type));
+ }
+ if (!string.IsNullOrWhiteSpace(status))
+ {
+ strSql += " AND PenaltyStatus = @Status";
+ listStr.Add(new SqlParameter("@Status", status));
+ }
+
+ strSql += " ORDER BY CompileDate DESC";
+
+ SqlParameter[] parameter = listStr.ToArray();
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+ return tb;
+ }
+
+ ///
+ /// 附件
+ ///
+ ///
+ ///
+ protected string ConvertAttachFile(object objId)
+ {
+ string fileUrl = string.Empty;
+ var model = BLL.AdminPenaltyService.GetAdminPenaltyById(objId.ToString());
+ if (model != null)
+ {
+ fileUrl = BLL.AttachFileService.GetBtnFileUrl(model.PenaltyId);
+ }
+ return fileUrl;
+ }
+
+ #region 过滤表头、排序、分页、关闭窗口
+
+ ///
+ /// 过滤表头
+ ///
+ ///
+ ///
+ protected void Grid1_FilterChange(object sender, EventArgs e)
+ {
+ BindGrid();
+ }
+
+ ///
+ /// 分页
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ Grid1.PageIndex = e.NewPageIndex;
+ BindGrid();
+ }
+
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, GridSortEventArgs e)
+ {
+ //Grid1.SortDirection = e.SortDirection;
+ //Grid1.SortField = e.SortField;
+ BindGrid();
+ }
+
+ ///
+ /// 分页显示条数下拉框
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+
+ #endregion
+
+
+ #region Grid双击事件
+
+ ///
+ /// Grid行双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ btnMenuModify_Click(sender, e);
+ }
+
+ ///
+ /// 编辑按钮
+ ///
+ ///
+ ///
+ protected void btnMenuModify_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+ return;
+ }
+ string codes = Grid1.SelectedRowID.Split(',')[0];
+ var checks = BLL.AdminPenaltyService.GetAdminPenaltyById(codes);
+ if (checks != null)
+ {
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("AdminPenaltyEdit.aspx?PenaltyId={0}&type={1}", codes, this.SysTemType)));
+ return;
+ }
+ }
+
+ #endregion
+
+ #region 获取按钮权限
+
+ ///
+ /// 获取按钮权限
+ ///
+ ///
+ ///
+ private void GetButtonPower()
+ {
+ if (Request.Params["value"] == "0")
+ {
+ return;
+ }
+ var buttonList = BLL.CommonService.GetAllButtonList(this.ProjectId, this.CurrUser.UserId, this.MenuId);
+ if (buttonList.Count() > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnAdd))
+ {
+ this.btnNew.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnDelete))
+ {
+ this.btnMenuDel.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnModify))
+ {
+ this.btnMenuModify.Hidden = false;
+ }
+ }
+ }
+
+ #endregion
+
+ ///
+ /// 删除
+ ///
+ ///
+ ///
+ protected void btnMenuDel_Click(object sender, EventArgs e)
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+ return;
+ }
+ string id = Grid1.SelectedRowID.Split(',')[0];
+ if (CommonService.GetAllButtonPowerList(CurrUser.LoginProjectId, CurrUser.UserId, this.MenuId, Const.BtnDelete))
+ {
+ BLL.AdminPenaltyService.DeleteAdminPenaltyById(id);
+ BindGrid();
+ Alert.ShowInTop("删除成功！", MessageBoxIcon.Success);
+ }
+ else
+ {
+ Alert.ShowInTop("您没有这个权限，请与管理员联系！", MessageBoxIcon.Success);
+ }
+ }
+
+ ///
+ /// 关闭弹出窗
+ ///
+ ///
+ ///
+ protected void Window1_Close(object sender, WindowCloseEventArgs e)
+ {
+ BindGrid();
+ }
+
+
+ #region 导出按钮
+ /// 导出按钮
+ ///
+ ///
+ ///
+ protected void btnOut_Click(object sender, EventArgs e)
+ {
+ Response.ClearContent();
+ string filename = Funs.GetNewFileName();
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("行政处罚" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ this.Grid1.PageSize = 500;
+ this.BindGrid();
+ Response.Write(GetGridTableHtml(Grid1));
+ Response.End();
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx.designer.cs
new file mode 100644
index 0000000..d129030
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenalty.aspx.designer.cs
@@ -0,0 +1,233 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Check
+{
+
+
+ public partial class AdminPenalty
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// panelLeftRegion 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel panelLeftRegion;
+
+ ///
+ /// ContentPanel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ContentPanel ContentPanel1;
+
+ ///
+ /// ucTree 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
+
+ ///
+ /// panelCenterRegion 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel panelCenterRegion;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// txtContent 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtContent;
+
+ ///
+ /// drpUnit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpUnit;
+
+ ///
+ /// drpPenaltyType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpPenaltyType;
+
+ ///
+ /// drpPenaltyStatus 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpPenaltyStatus;
+
+ ///
+ /// btnNew 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnNew;
+
+ ///
+ /// btnOut 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut;
+
+ ///
+ /// lblNumber 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblNumber;
+
+ ///
+ /// lbtnFileUrl 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbtnFileUrl;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuModify 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuModify;
+
+ ///
+ /// btnMenuDel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuDel;
+ }
+}
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx
new file mode 100644
index 0000000..1b85361
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx
@@ -0,0 +1,104 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AdminPenaltyEdit.aspx.cs" Inherits="FineUIPro.Web.CQMS.Check.AdminPenaltyEdit" %>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx.cs
new file mode 100644
index 0000000..301688d
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx.cs
@@ -0,0 +1,234 @@
+using BLL;
+using System;
+
+namespace FineUIPro.Web.CQMS.Check
+{
+ public partial class AdminPenaltyEdit : PageBase
+ {
+ ///
+ /// 项目主键
+ ///
+ public string ProjectId
+ {
+ get
+ {
+ return (string)ViewState["ProjectId"];
+ }
+ set
+ {
+ ViewState["ProjectId"] = value;
+ }
+ }
+ ///
+ /// 主键
+ ///
+ public string PenaltyId
+ {
+ get { return (string)ViewState["PenaltyId"]; }
+ set { ViewState["PenaltyId"] = value; }
+ }
+
+ ///
+ /// 图片是否可以编辑 -1查看 0编辑
+ ///
+ public int QuestionImg
+ {
+ get { return Convert.ToInt32(ViewState["QuestionImg"]); }
+ set { ViewState["QuestionImg"] = value; }
+ }
+ ///
+ /// 1：安全、2：质量
+ ///
+ public string SysTemType
+ {
+ get { return (string)ViewState["SysTemType"]; }
+ set { ViewState["SysTemType"] = value; }
+ }
+ ///
+ /// 菜单Id
+ ///
+ public string MenuId
+ {
+ get { return (string)ViewState["MenuId"]; }
+ set { ViewState["MenuId"] = value; }
+ }
+
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ this.ProjectId = this.CurrUser.LoginProjectId;
+ this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+ this.PenaltyId = Request.Params["PenaltyId"];
+ this.SysTemType = Request.Params["type"] ?? "1";
+ this.MenuId = BLL.Const.AdminPenaltyMenuId;
+ UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, "", true);
+ if (!string.IsNullOrEmpty(PenaltyId))
+ {
+ //this.hdId.Text = PenaltyId;
+ Model.Check_AdminPenalty model = BLL.AdminPenaltyService.GetAdminPenaltyById(PenaltyId);
+ if (model != null)
+ {
+ this.ProjectId = model.ProjectId;
+ this.txtCode.Text = model.PenaltyCode;
+ this.txtPenaltyDate.Text = model.PenaltyDate.ToString("yyyy-MM-dd");
+ this.drpUnit.SelectedValue = model.UnitId;
+ this.drpPenaltyType.SelectedValue = model.PenaltyType;
+ this.drpPenaltyStatus.SelectedValue = model.PenaltyStatus;
+ if (model.PenaltyAmount.HasValue)
+ {
+ this.txtMoney.Text = model.PenaltyAmount.Value.ToString();
+ }
+ this.txtPenaltyAuthority.Text = model.PenaltyAuthority;
+ this.txtDescription.Text = model.PenaltyContent;
+ this.txtRemark.Text = model.Remark;
+ }
+ }
+ else
+ {
+ ////自动生成编码
+ this.txtCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(this.MenuId, this.ProjectId, this.CurrUser.UnitId);
+ this.txtPenaltyDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
+ }
+ }
+ }
+
+ protected void WindowAtt_Close(object sender, WindowCloseEventArgs e)
+ {
+
+ }
+
+ ///
+ /// 保存
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ string unitId = this.drpUnit.SelectedValue;
+ if (string.IsNullOrWhiteSpace(unitId) || unitId == Const._Null)
+ {
+ Alert.ShowInTop("请选择处罚单位！", MessageBoxIcon.Warning);
+ return;
+ }
+ if (!string.IsNullOrWhiteSpace(this.txtMoney.Text))
+ {
+ decimal moneyValue;
+ if (decimal.TryParse(this.txtMoney.Text.Trim(), out moneyValue))
+ {
+
+ }
+ else
+ {
+ Alert.ShowInTop("金额必须为有效数字！", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ SaveData(true);
+ PageContext.RegisterStartupScript(ActiveWindow.GetHideRefreshReference());
+ }
+
+ ///
+ /// 保存
+ ///
+ private void SaveData(bool isClose)
+ {
+ string unitId = this.drpUnit.SelectedValue;
+ if (string.IsNullOrWhiteSpace(unitId) || unitId == Const._Null)
+ {
+ Alert.ShowInTop("请选择处罚单位！", MessageBoxIcon.Warning);
+ return;
+ }
+
+ Model.Check_AdminPenalty model = new Model.Check_AdminPenalty();
+ model.ProjectId = this.CurrUser.LoginProjectId;
+ model.PenaltyCode = this.txtCode.Text.Trim();
+ model.UnitId = unitId;
+ model.UnitName = this.drpUnit.SelectedText;
+ model.PenaltyType = this.drpPenaltyType.SelectedValue;
+ model.PenaltyStatus = this.drpPenaltyStatus.SelectedValue;
+ if (!string.IsNullOrWhiteSpace(this.txtMoney.Text))
+ {
+ decimal moneyValue;
+ if (decimal.TryParse(this.txtMoney.Text.Trim(), out moneyValue))
+ {
+ model.PenaltyAmount = moneyValue;
+ }
+ else
+ {
+ Alert.ShowInTop("金额必须为有效数字！", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ model.PenaltyDate = Convert.ToDateTime(this.txtPenaltyDate.Text.Trim());
+ model.PenaltyContent = this.txtDescription.Text.Trim();
+ model.PenaltyAuthority = this.txtPenaltyAuthority.Text.Trim();
+ model.Remark = this.txtRemark.Text.Trim();
+ model.SysType = this.SysTemType;
+
+ if (string.IsNullOrEmpty(this.PenaltyId))
+ {
+ this.PenaltyId = SQLHelper.GetNewID(typeof(Model.Check_AdminPenalty));
+ model.PenaltyId = this.PenaltyId;
+ model.CompileMan = this.CurrUser.UserId;
+ model.CompileDate = DateTime.Now;
+ BLL.AdminPenaltyService.AddAdminPenalty(model);
+ }
+ else
+ {
+ model.PenaltyId = this.PenaltyId;
+ BLL.AdminPenaltyService.UpdateAdminPenalty(model);
+ }
+
+ if (isClose)
+ {
+ ShowNotify("保存成功！", MessageBoxIcon.Success);
+ //更新三库事故事件
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateAdminPenaltyRecord(model.PenaltyId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+ }
+ }
+
+ #region 附件上传
+ ///
+ /// 上传附件
+ ///
+ ///
+ ///
+ protected void btnAttachUrl_Click2(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(this.PenaltyId))
+ {
+ this.SaveData(false);
+ }
+ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckAdminPenalty&menuId={1}", this.PenaltyId, this.MenuId)));
+ }
+ #endregion
+ #region 附件上传
+ ///
+ /// 上传附件
+ ///
+ ///
+ ///
+ protected void btnAttachUrl_Click(object sender, EventArgs e)
+ {
+ if (this.btnSave.Hidden)
+ {
+ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckAdminPenalty&menuId={1}&type=-1", this.PenaltyId, this.MenuId)));
+ }
+ else
+ {
+ if (string.IsNullOrEmpty(this.PenaltyId))
+ {
+ SaveData(false);
+ }
+ PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/CheckAdminPenalty&menuId={1}", this.PenaltyId, this.MenuId)));
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx.designer.cs
new file mode 100644
index 0000000..2f5f59c
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/AdminPenaltyEdit.aspx.designer.cs
@@ -0,0 +1,188 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.CQMS.Check
+{
+
+
+ public partial class AdminPenaltyEdit
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// SimpleForm1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm1;
+
+ ///
+ /// txtCode 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtCode;
+
+ ///
+ /// txtPenaltyDate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtPenaltyDate;
+
+ ///
+ /// drpUnit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpUnit;
+
+ ///
+ /// drpPenaltyType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpPenaltyType;
+
+ ///
+ /// drpPenaltyStatus 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpPenaltyStatus;
+
+ ///
+ /// txtMoney 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtMoney;
+
+ ///
+ /// txtPenaltyAuthority 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtPenaltyAuthority;
+
+ ///
+ /// txtDescription 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtDescription;
+
+ ///
+ /// txtRemark 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtRemark;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// lbTemp 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label lbTemp;
+
+ ///
+ /// btnAttachUrl 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnAttachUrl;
+
+ ///
+ /// ToolbarFill1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// btnClose 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnClose;
+
+ ///
+ /// WindowAtt 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window WindowAtt;
+ }
+}
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs
index 3c5e4ff..4faa0ca 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunish.aspx.cs
@@ -223,27 +223,28 @@ namespace FineUIPro.Web.CQMS.Check
return "";
}
- protected string ConvertRewardAndPunishType(object Type,object RewardAndPunishType)
+ protected string ConvertRewardAndPunishType(object Type, object RewardAndPunishType)
{
Model.Sys_Const model;
if (Type != null && Type.ToString() == "1")
{
- model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == "RewardType" && x.ConstValue == RewardAndPunishType.ToString());
+ model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == BLL.ConstValue.Group_RewardType && x.ConstValue == RewardAndPunishType.ToString());
}
else
{
- model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == "PunishType" && x.ConstValue == RewardAndPunishType.ToString());
+ model = Funs.DB.Sys_Const.FirstOrDefault(x => x.GroupId == BLL.ConstValue.Group_PunishType && x.ConstValue == RewardAndPunishType.ToString());
}
if (model == null)
{
return "";
}
-
+
return model.ConstText;
}
+
protected string ConvertUnitName(object uintid)
{
if (uintid != null && !string.IsNullOrEmpty(uintid.ToString()))
@@ -337,7 +338,7 @@ namespace FineUIPro.Web.CQMS.Check
else
{
PageContext.RegisterStartupScript(Window1.GetShowReference(
- String.Format("RewardAndPunishEdit.aspx?RewardAndPunishID={0}", codes, "编辑 - ")));
+ String.Format("RewardAndPunishEdit.aspx?RewardAndPunishID={0}&sysTemType={1}", codes, this.SysTemType, "编辑 - ")));
return;
}
}
@@ -432,16 +433,17 @@ namespace FineUIPro.Web.CQMS.Check
{
if (this.drpType.SelectedText == "奖励")
{
- ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, "RewardType", true);
+ ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, BLL.ConstValue.Group_RewardType, true);
}
else
{
- ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, "PunishType", true);
+ ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, BLL.ConstValue.Group_PunishType, true);
}
BindGrid();
}
+
protected string ConvertAttachFile(object rewardAndPunishID)
{
string fileUrl = "";
diff --git a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunishEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunishEdit.aspx.cs
index e3a1d05..47bc6c7 100644
--- a/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunishEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/CQMS/Check/RewardAndPunishEdit.aspx.cs
@@ -207,9 +207,18 @@ namespace FineUIPro.Web.CQMS.Check
}
ShowNotify("保存成功！", MessageBoxIcon.Success);
+
+ //更新三库事故事件
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateSafetyRewardRecord(RewardAndPunish.RewardAndPunishID, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
+
#region 单位下拉框事件
///
@@ -259,12 +268,13 @@ namespace FineUIPro.Web.CQMS.Check
{
if (this.drpType.SelectedValue == "1")
{
- ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, "RewardType", false);
+ ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType,BLL.ConstValue.Group_RewardType, false);
}
else
{
- ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, "PunishType", false);
+ ConstValue.InitConstValueDropDownList(this.drpRewardAndPunishType, BLL.ConstValue.Group_PunishType, false);
}
}
+
}
}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx b/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx
index 789fead..2073bbe 100644
--- a/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx
+++ b/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx
@@ -74,7 +74,7 @@
-
+
<%-- listStr = new List
{
new SqlParameter("@ProjectId", this.ProjectId)
diff --git a/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx.designer.cs
index fc1f5e5..5d05220 100644
--- a/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/Door/InOutRecord.aspx.designer.cs
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Door
@@ -15,227 +15,227 @@ namespace FineUIPro.Web.Door
{
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.PageManager PageManager1;
///
- /// Panel1 控件。
+ /// Panel1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Panel Panel1;
///
- /// panelLeftRegion 控件。
+ /// panelLeftRegion control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Panel panelLeftRegion;
///
- /// ContentPanel1 控件。
+ /// ContentPanel1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ContentPanel ContentPanel1;
///
- /// ucTree 控件。
+ /// ucTree control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
///
- /// panelCenterRegion 控件。
+ /// panelCenterRegion control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Panel panelCenterRegion;
///
- /// Grid1 控件。
+ /// Grid1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Grid Grid1;
///
- /// Toolbar2 控件。
+ /// Toolbar2 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar2;
///
- /// drpUnit 控件。
+ /// drpUnit control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList drpUnit;
///
- /// drpWorkTeam 控件。
+ /// drpWorkTeam control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList drpWorkTeam;
///
- /// drpWorkPost 控件。
+ /// drpWorkPost control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList drpWorkPost;
///
- /// Toolbar1 控件。
+ /// Toolbar1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar1;
///
- /// txtStartDate 控件。
+ /// txtStartDate control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DatePicker txtStartDate;
///
- /// txtEndDate 控件。
+ /// txtEndDate control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DatePicker txtEndDate;
///
- /// txtName 控件。
+ /// txtName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtName;
///
- /// btnSearch 控件。
+ /// btnSearch control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnSearch;
///
- /// btnOut 控件。
+ /// btnOut control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnOut;
///
- /// labNumber 控件。
+ /// lblNumber control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
- protected global::System.Web.UI.WebControls.Label labNumber;
+ protected global::System.Web.UI.WebControls.Label lblNumber;
///
- /// ToolbarSeparator1 控件。
+ /// ToolbarSeparator1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
///
- /// ToolbarText1 控件。
+ /// ToolbarText1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarText ToolbarText1;
///
- /// ddlPageSize 控件。
+ /// ddlPageSize control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList ddlPageSize;
///
- /// Window1 控件。
+ /// Window1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Window Window1;
///
- /// Menu1 控件。
+ /// Menu1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Menu Menu1;
///
- /// btnView 控件。
+ /// btnView control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.MenuButton btnView;
}
diff --git a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
index c6aab3b..4b8491a 100644
--- a/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SUBQHSE/FineUIPro.Web/FineUIPro.Web.csproj
@@ -375,6 +375,8 @@
+
+
@@ -1165,11 +1167,14 @@
+
+
+
@@ -1342,6 +1347,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7371,6 +7388,10 @@
ProjectSysSet.aspx
+
+
+
+
CheckFineList.aspx
ASPXCodeBehind
@@ -12664,6 +12685,8 @@
indexProjectOld.aspx
+
+
LocationSelect.aspx
ASPXCodeBehind
@@ -12696,6 +12719,10 @@
MasterProjectDataUsage.aspx
+
+
+
+
ProjectDevices.aspx
ASPXCodeBehind
@@ -12710,6 +12737,30 @@
ProjectDevicesEdit.aspx
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Schedule.aspx
ASPXCodeBehind
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx
index bdc2a3c..0ba8806 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx
@@ -15,56 +15,126 @@
AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
LabelAlign="Right">
-
+
+ MaxLength="50" Readonly="true" LabelWidth="80px">
+ Required="true" ShowRedStar="true" MaxLength="50" FocusOnPageLoad="true" LabelWidth="110px">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%----%>
+
+
+
+
+
+
+ <%----%>
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
+
-
+ MaxLength="500" Height="70px" LabelWidth="80px">
-
+
+
+
+
+
+
+
+
+
+
+
+
+ <%----%>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%-- --%>
+ <%-- --%>
+ <%--
+ <%-- BodyPadding="0px"> --%>
+ <%-- --%>
+ <%-- --%>
+ <%-- --%>
+ <%-- --%>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.cs
index b748a58..33f0dc7 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.cs
@@ -48,6 +48,12 @@ namespace FineUIPro.Web.HSSE.Accident
if (!IsPostBack)
{
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+ WorkPostService.InitWorkPostNameDropDownList(this.drpPost, true);
+ UserService.InitUserProjectIdUnitTypeDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, null, true);
+ Funs.FineUIPleaseSelect(this.dpAccidentLevel);
+ Funs.FineUIPleaseSelect(this.dpAccidentType);
+ Funs.FineUIPleaseSelect(this.dpResponsibilityType);
+
this.ProjectId = this.CurrUser.LoginProjectId;
BLL.UnitService.InitUnitDropDownList(this.drpUnitId, this.ProjectId, true);
this.drpUnitId.SelectedValue = this.CurrUser.UnitId;
@@ -98,6 +104,34 @@ namespace FineUIPro.Web.HSSE.Accident
{
this.txtDeathPersonNum.Text = accidentHandle.DeathPersonNum.ToString();
}
+ if (!string.IsNullOrWhiteSpace(accidentHandle.AccidentLevel))
+ {
+ this.dpAccidentLevel.SelectedValue = accidentHandle.AccidentLevel.ToString();
+ }
+ if (!string.IsNullOrWhiteSpace(accidentHandle.AccidentType))
+ {
+ this.dpAccidentType.SelectedValue = accidentHandle.AccidentType.ToString();
+ }
+ if (!string.IsNullOrWhiteSpace(accidentHandle.PositionName))
+ {
+ this.drpPost.SelectedValue = accidentHandle.PositionName.ToString();
+ }
+ if (!string.IsNullOrWhiteSpace(accidentHandle.ResponsibilityType))
+ {
+ this.dpResponsibilityType.SelectedValue = accidentHandle.ResponsibilityType.ToString();
+ }
+ if (!string.IsNullOrWhiteSpace(accidentHandle.ResponsibleMan))
+ {
+ this.drpResponsibleMan.SelectedValue = accidentHandle.ResponsibleMan.ToString();
+ }
+ this.txtAccidentLocation.Text = accidentHandle.AccidentLocation;
+ this.txtContractingResponsibility.Text = accidentHandle.ContractingResponsibility;
+ this.txtResponsibilityDesc.Text = accidentHandle.ResponsibilityDesc;
+ if (accidentHandle.IndirectMoneyLoss != null)
+ {
+ this.txtIndirectMoneyLoss.Text = accidentHandle.IndirectMoneyLoss.ToString();
+ }
+
this.txtAccidentHandle.Text = accidentHandle.AccidentHandle;
//this.txtRemark.Text = accidentHandle.Remark;
}
@@ -145,8 +179,36 @@ namespace FineUIPro.Web.HSSE.Accident
//Remark = this.txtRemark.Text.Trim(),
CompileMan = this.CurrUser.UserId,
CompileDate = DateTime.Now,
- States = BLL.Const.State_0
+ States = BLL.Const.State_0,
+ AccidentLocation = this.txtAccidentLocation.Text.Trim(),
+ IndirectMoneyLoss = Funs.GetNewDecimalOrZero(this.txtIndirectMoneyLoss.Text.Trim()),
+ ContractingResponsibility = this.txtContractingResponsibility.Text.Trim(),
+ ResponsibilityDesc = this.txtResponsibilityDesc.Text.Trim(),
+
};
+
+ if (this.dpAccidentLevel.SelectedValue != BLL.Const._Null)
+ {
+ accidentHandle.AccidentLevel = this.dpAccidentLevel.SelectedValue;
+ }
+ if (this.dpAccidentType.SelectedValue != BLL.Const._Null)
+ {
+ accidentHandle.AccidentType = this.dpAccidentType.SelectedValue;
+ }
+ if (this.drpPost.SelectedValue != BLL.Const._Null)
+ {
+ accidentHandle.PositionName = this.drpPost.SelectedValue;
+ }
+ if (this.dpResponsibilityType.SelectedValue != BLL.Const._Null)
+ {
+ accidentHandle.ResponsibilityType = this.dpResponsibilityType.SelectedValue;
+ }
+ if (this.drpResponsibleMan.SelectedValue != BLL.Const._Null)
+ {
+ accidentHandle.ResponsibleMan = this.drpResponsibleMan.SelectedValue;
+ accidentHandle.ResponsibleManName = this.drpResponsibleMan.SelectedText;
+ }
+
if (this.drpUnitId.SelectedValue != BLL.Const._Null)
{
accidentHandle.UnitId = this.drpUnitId.SelectedValue;
@@ -165,6 +227,14 @@ namespace FineUIPro.Web.HSSE.Accident
BLL.AccidentHandleService.AddAccidentHandle(accidentHandle);
BLL.LogService.AddSys_Log(this.CurrUser, this.txtAccidentHandleCode.Text, this.AccidentHandleId, BLL.Const.ProjectAccidentHandleMenuId, Const.BtnAdd);
}
+ //更新三库事故事件
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateAccidentRecord(this.AccidentHandleId ,ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+
//Project_HSSEData_HSSEService.StatisticalData(accidentHandle.ProjectId, Project_HSSEData_HSSEService.HSSEDateType.WorkingHours);
}
#endregion
@@ -184,5 +254,29 @@ namespace FineUIPro.Web.HSSE.Accident
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/AccidentHandleAttachUrl&menuId={1}", this.AccidentHandleId, BLL.Const.ProjectAccidentHandleMenuId)));
}
#endregion
+
+ ///
+ /// 单位选择事件
+ ///
+ ///
+ ///
+ protected void drpUnit_OnSelectedIndexChanged(object sender, EventArgs e)
+ {
+ using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
+ {
+ this.drpResponsibleMan.Items.Clear();
+ if (this.drpUnitId.SelectedValue != BLL.Const._Null)
+ {
+ this.drpResponsibleMan.DataSource = from x in db.Sys_User
+ join y in db.Project_ProjectUser on x.UserId equals y.UserId
+ where y.ProjectId == this.CurrUser.LoginProjectId && x.UnitId == this.drpUnitId.SelectedValue
+ select x;
+ this.drpResponsibleMan.DataBind();
+ }
+ Funs.FineUIPleaseSelect(this.drpResponsibleMan);
+ this.drpResponsibleMan.SelectedValue = BLL.Const._Null;
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.designer.cs
index 14c6830..c49b865 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleEdit.aspx.designer.cs
@@ -1,203 +1,286 @@
//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.HSSE.Accident {
-
-
- public partial class AccidentHandleEdit {
-
+namespace FineUIPro.Web.HSSE.Accident
+{
+
+
+ public partial class AccidentHandleEdit
+ {
+
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
- /// SimpleForm1 控件。
+ /// SimpleForm1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
- /// txtAccidentHandleCode 控件。
+ /// txtAccidentHandleCode control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtAccidentHandleCode;
-
+
///
- /// txtAccidentHandleName 控件。
+ /// txtAccidentHandleName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtAccidentHandleName;
-
+
///
- /// txtAccidentDate 控件。
+ /// txtAccidentDate control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DatePicker txtAccidentDate;
-
+
///
- /// drpUnitId 控件。
+ /// txtWorkHoursLoss control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DropDownList drpUnitId;
-
- ///
- /// txtMoneyLoss 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.NumberBox txtMoneyLoss;
-
- ///
- /// txtWorkHoursLoss 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtWorkHoursLoss;
-
+
///
- /// txtMinorInjuriesPersonNum 控件。
+ /// txtMoneyLoss control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.NumberBox txtMoneyLoss;
+
+ ///
+ /// txtIndirectMoneyLoss control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.NumberBox txtIndirectMoneyLoss;
+
+ ///
+ /// txtMinorInjuriesPersonNum control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtMinorInjuriesPersonNum;
-
+
///
- /// txtInjuriesPersonNum 控件。
+ /// txtInjuriesPersonNum control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtInjuriesPersonNum;
-
+
///
- /// txtDeathPersonNum 控件。
+ /// txtDeathPersonNum control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtDeathPersonNum;
-
+
///
- /// txtAccidentDef 控件。
+ /// dpAccidentLevel control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList dpAccidentLevel;
+
+ ///
+ /// dpAccidentType control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList dpAccidentType;
+
+ ///
+ /// drpUnitId control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpUnitId;
+
+ ///
+ /// txtAccidentLocation control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtAccidentLocation;
+
+ ///
+ /// txtAccidentDef control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextArea txtAccidentDef;
-
+
///
- /// txtAccidentHandle 控件。
+ /// txtAccidentHandle control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextArea txtAccidentHandle;
-
+
///
- /// Toolbar1 控件。
+ /// txtContractingResponsibility control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextArea txtContractingResponsibility;
+
+ ///
+ /// drpPost control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpPost;
+
+ ///
+ /// dpResponsibilityType control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList dpResponsibilityType;
+
+ ///
+ /// drpResponsibleMan control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpResponsibleMan;
+
+ ///
+ /// txtResponsibilityDesc control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextArea txtResponsibilityDesc;
+
+ ///
+ /// Toolbar1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
- /// lbTemp 控件。
+ /// lbTemp control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Label lbTemp;
-
+
///
- /// btnAttachUrl 控件。
+ /// btnAttachUrl control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnAttachUrl;
-
+
///
- /// ToolbarFill1 控件。
+ /// ToolbarFill1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+
///
- /// btnSave 控件。
+ /// btnSave control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnSave;
-
+
///
- /// btnClose 控件。
+ /// btnClose control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnClose;
-
+
///
- /// WindowAtt 控件。
+ /// WindowAtt control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Window WindowAtt;
}
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx
index 0d3eb62..9ce8d0c 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx
@@ -15,54 +15,111 @@
AutoScroll="true" BodyPadding="10px" runat="server" RedStarPosition="BeforeText"
LabelAlign="Right">
-
+
+ Readonly="true">
+ Readonly="true">
-
-
-
+
-
-
-
+ NoNegative="True" EmptyText="0" DecimalPrecision="0" NoDecimal="False" LabelWidth="90px">
+
+
+
+
+
+
+
+
+
+ NoNegative="True" EmptyText="0" DecimalPrecision="0" NoDecimal="False" LabelWidth="90px">
+ NoNegative="True" EmptyText="0" DecimalPrecision="0" NoDecimal="False" LabelWidth="90px">
+ NoNegative="True" EmptyText="0" DecimalPrecision="0" NoDecimal="False" LabelWidth="90px">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ Readonly="true" Height="90px">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%-- --%>
+ <%-- --%>
+ <%--
+ <%-- BodyPadding="0px"> --%>
+ <%-- --%>
+ <%-- --%>
+ <%-- --%>
+ <%-- --%>
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.cs
index d52e644..8db72ac 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.cs
@@ -65,6 +65,47 @@ namespace FineUIPro.Web.HSSE.Accident
{
this.txtDeathPersonNum.Text = accidentHandle.DeathPersonNum.ToString();
}
+ if (accidentHandle.IndirectMoneyLoss != null)
+ {
+ this.txtIndirectMoneyLoss.Text = accidentHandle.IndirectMoneyLoss.ToString();
+ }
+ if (accidentHandle.AccidentLevel != null)
+ {
+ this.txtAccidentLevel.Text = accidentHandle.AccidentLevel.ToString();
+ }
+ if (accidentHandle.AccidentType != null)
+ {
+ this.txtAccidentType.Text = accidentHandle.AccidentType.ToString();
+ }
+ if (accidentHandle.AccidentLocation != null)
+ {
+ this.txtAccidentLocation.Text = accidentHandle.AccidentLocation.ToString();
+ }
+ if (accidentHandle.AccidentHandle != null)
+ {
+ this.txtAccidentHandle.Text = accidentHandle.AccidentHandle;
+ }
+ if (accidentHandle.ContractingResponsibility != null)
+ {
+ this.txtContractingResponsibility.Text = accidentHandle.ContractingResponsibility.ToString();
+ }
+ if (accidentHandle.PositionName != null)
+ {
+ this.txtPositionName.Text = accidentHandle.PositionName.ToString();
+ }
+ if (accidentHandle.ResponsibilityType != null)
+ {
+ this.txtResponsibilityType.Text = accidentHandle.ResponsibilityType.ToString();
+ }
+ if (accidentHandle.ResponsibleMan != null)
+ {
+ this.txtResponsibleMan.Text = accidentHandle.ResponsibleMan.ToString();
+ }
+ if (accidentHandle.ResponsibilityDesc != null)
+ {
+ this.txtResponsibilityDesc.Text = accidentHandle.ResponsibilityDesc.ToString();
+ }
+
this.txtAccidentHandle.Text = accidentHandle.AccidentHandle;
this.txtUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(accidentHandle.UnitId);
}
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.designer.cs
index 194a235..2174cef 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Accident/AccidentHandleView.aspx.designer.cs
@@ -1,194 +1,277 @@
//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.HSSE.Accident {
-
-
- public partial class AccidentHandleView {
-
+namespace FineUIPro.Web.HSSE.Accident
+{
+
+
+ public partial class AccidentHandleView
+ {
+
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
- /// SimpleForm1 控件。
+ /// SimpleForm1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
- /// txtAccidentHandleCode 控件。
+ /// txtAccidentHandleCode control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtAccidentHandleCode;
-
+
///
- /// txtAccidentHandleName 控件。
+ /// txtAccidentHandleName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtAccidentHandleName;
-
+
///
- /// txtAccidentDate 控件。
+ /// txtAccidentDate control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtAccidentDate;
-
+
///
- /// txtUnitName 控件。
+ /// txtWorkHoursLoss control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtUnitName;
-
- ///
- /// txtMoneyLoss 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.NumberBox txtMoneyLoss;
-
- ///
- /// txtWorkHoursLoss 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtWorkHoursLoss;
-
+
///
- /// txtMinorInjuriesPersonNum 控件。
+ /// txtMoneyLoss control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.NumberBox txtMoneyLoss;
+
+ ///
+ /// txtIndirectMoneyLoss control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.NumberBox txtIndirectMoneyLoss;
+
+ ///
+ /// txtMinorInjuriesPersonNum control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtMinorInjuriesPersonNum;
-
+
///
- /// txtInjuriesPersonNum 控件。
+ /// txtInjuriesPersonNum control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtInjuriesPersonNum;
-
+
///
- /// txtDeathPersonNum 控件。
+ /// txtDeathPersonNum control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.NumberBox txtDeathPersonNum;
-
+
///
- /// txtAccidentDef 控件。
+ /// txtAccidentLevel control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtAccidentLevel;
+
+ ///
+ /// txtAccidentType control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtAccidentType;
+
+ ///
+ /// txtUnitName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtUnitName;
+
+ ///
+ /// txtAccidentLocation control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtAccidentLocation;
+
+ ///
+ /// txtAccidentDef control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextArea txtAccidentDef;
-
+
///
- /// txtAccidentHandle 控件。
+ /// txtAccidentHandle control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextArea txtAccidentHandle;
-
+
///
- /// Toolbar1 控件。
+ /// txtContractingResponsibility control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextArea txtContractingResponsibility;
+
+ ///
+ /// txtPositionName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtPositionName;
+
+ ///
+ /// txtResponsibilityType control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtResponsibilityType;
+
+ ///
+ /// txtResponsibleMan control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtResponsibleMan;
+
+ ///
+ /// txtResponsibilityDesc control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextArea txtResponsibilityDesc;
+
+ ///
+ /// Toolbar1 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
- /// lbTemp 控件。
+ /// lbTemp control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Label lbTemp;
-
+
///
- /// btnAttachUrl 控件。
+ /// btnAttachUrl control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnAttachUrl;
-
+
///
- /// ToolbarFill1 控件。
+ /// ToolbarFill1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+
///
- /// btnClose 控件。
+ /// btnClose control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnClose;
-
+
///
- /// WindowAtt 控件。
+ /// WindowAtt control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Window WindowAtt;
}
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
index 624f36c..efcdcfd 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAdd.aspx.cs
@@ -248,7 +248,7 @@ namespace FineUIPro.Web.HSSE.Check
Requirement = requirement,
LimitTime = Funs.GetNewDateTime(limitTime),
};
- var rectify = rectifyList.FirstOrDefault(x => x.RectifyName == rectifyId);
+ var rectify = rectifyList.FirstOrDefault(x => x.RectifyName == rectifyId || x.RectifyId == rectifyId);
if (rectify != null)
{
item.RectifyId = rectify.RectifyId;
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
index 5bd2b3b..e658619 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesAudit.aspx.cs
@@ -194,6 +194,14 @@ namespace FineUIPro.Web.HSSE.Check
Funs.DB.SubmitChanges();
ShowNotify("提交成功！", MessageBoxIcon.Success);
+ //更新三库隐患记录
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateHazardRecord(this.RectifyNoticesId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+
if (string.IsNullOrEmpty(Request.Params["Main"]))
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
index b8e2ffa..c5ed185 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesEdit.aspx.cs
@@ -1197,6 +1197,14 @@ namespace FineUIPro.Web.HSSE.Check
}
ShowNotify("提交成功！", MessageBoxIcon.Success);
+ //更新三库隐患记录
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateHazardRecord(this.RectifyNoticesId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
#endregion
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
index c005a81..fb9aa57 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRecheck.aspx.cs
@@ -298,6 +298,14 @@ namespace FineUIPro.Web.HSSE.Check
// Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.HiddenDangerTroubleshooting);
// Project_HSSEData_HiddenDangerDetailService.StatisticalData(this.CurrUser.LoginProjectId);
ShowNotify(saveType + "成功！", MessageBoxIcon.Success);
+ //更新三库隐患记录
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateHazardRecord(this.RectifyNoticesId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+
if (string.IsNullOrEmpty(Request.Params["Main"]))
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs
index e0678b4..77dd705 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/RectifyNoticesRectify.aspx.cs
@@ -266,6 +266,14 @@ namespace FineUIPro.Web.HSSE.Check
}
ShowNotify(saveType + "成功！", MessageBoxIcon.Success);
+ //更新三库隐患记录
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateHazardRecord(this.RectifyNoticesId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+
if (string.IsNullOrEmpty(Request.Params["Main"]))
{
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx
index f47751f..dd59b5f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPerson.aspx
@@ -36,6 +36,13 @@
+
+
+
+
+
+
@@ -80,7 +87,10 @@
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="违章日期"
HeaderTextAlign="Center" TextAlign="Center">
-
+
+
+
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
namespace FineUIPro.Web.Check
@@ -15,218 +15,227 @@ namespace FineUIPro.Web.Check
{
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.PageManager PageManager1;
///
- /// Panel1 控件。
+ /// Panel1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Panel Panel1;
///
- /// panelLeftRegion 控件。
+ /// panelLeftRegion control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Panel panelLeftRegion;
///
- /// ContentPanel1 控件。
+ /// ContentPanel1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ContentPanel ContentPanel1;
///
- /// ucTree 控件。
+ /// ucTree control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Web.Controls.UnitProjectTControl ucTree;
///
- /// panelCenterRegion 控件。
+ /// panelCenterRegion control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Panel panelCenterRegion;
///
- /// Grid1 控件。
+ /// Grid1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Grid Grid1;
///
- /// Toolbar2 控件。
+ /// Toolbar2 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar2;
///
- /// txtViolationPersonCode 控件。
+ /// drpLevel control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpLevel;
+
+ ///
+ /// txtViolationPersonCode control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtViolationPersonCode;
///
- /// txtPersonName 控件。
+ /// txtPersonName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtPersonName;
///
- /// ToolbarFill1 控件。
+ /// ToolbarFill1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
///
- /// btnNew 控件。
+ /// btnNew control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnNew;
///
- /// btnOut 控件。
+ /// btnOut control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnOut;
///
- /// lblNumber 控件。
+ /// lblNumber control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label lblNumber;
///
- /// lblViolationType 控件。
+ /// lblViolationType control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label lblViolationType;
///
- /// lblHandleStep 控件。
+ /// lblHandleStep control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.WebControls.Label lblHandleStep;
///
- /// ToolbarSeparator1 控件。
+ /// ToolbarSeparator1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
///
- /// ToolbarText1 控件。
+ /// ToolbarText1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarText ToolbarText1;
///
- /// ddlPageSize 控件。
+ /// ddlPageSize control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList ddlPageSize;
///
- /// Window1 控件。
+ /// Window1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Window Window1;
///
- /// Menu1 控件。
+ /// Menu1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Menu Menu1;
///
- /// btnMenuEdit 控件。
+ /// btnMenuEdit control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.MenuButton btnMenuEdit;
///
- /// btnMenuDelete 控件。
+ /// btnMenuDelete control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.MenuButton btnMenuDelete;
}
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx
index f92ea42..afbe0fc 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx
@@ -17,47 +17,47 @@
+ MaxLength="50">
+ MatchFieldWidth="false" LabelAlign="Right" AutoPostBack="true" OnTextChanged="drpPersonId_TextChanged"
+ EnableMultiSelect="false" Required="true" ShowRedStar="true">
+ DataTextField="PersonName" DataKeyNames="PersonId" AllowSorting="true" SortField="UnitName,CardNo"
+ SortDirection="ASC" EnableColumnLines="true" Hidden="true" Width="800px" OnSort="Grid1_Sort"
+ Height="350px" EnableMultiSelect="false" PageSize="10000">
+ OnTextChanged="TextBox_TextChanged" Width="210px" LabelWidth="60px" LabelAlign="Right">
+ OnTextChanged="TextBox_TextChanged" Width="210px" LabelWidth="60px" LabelAlign="Right">
+ OnTextChanged="TextBox_TextChanged" Width="210px" LabelWidth="60px" LabelAlign="Right">
-
+ TextAlign="Center"/>
+
+ FieldType="String" HeaderText="卡号" HeaderTextAlign="Center" TextAlign="Left"
+ ExpandUnusedSpace="true">
+ SortField="PersonName" FieldType="String" HeaderText="姓名" HeaderTextAlign="Center"
+ TextAlign="Left">
+ FieldType="String" HeaderText="岗位" HeaderTextAlign="Center" TextAlign="Left">
@@ -69,8 +69,7 @@
-
+
@@ -84,29 +83,53 @@
-
-
+ AutoPostBack="true" OnSelectedIndexChanged="drpViolationName_SelectedIndexChanged">
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+ <%-- --%>
+ <%-- --%>
+ <%--
+ <%-- BodyPadding="0px"> --%>
+ <%-- --%>
+ <%-- --%>
+ <%-- --%>
+ <%-- --%>
+
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.cs
index 29f9be5..65959d4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.cs
@@ -123,6 +123,9 @@ namespace FineUIPro.Web.Check
this.drpHandleStep.SelectedValue = violationPerson.HandleStep;
}
this.txtViolationDef.Text = violationPerson.ViolationDef;
+ this.drpRectificationStatus.SelectedValue = violationPerson.RectificationStatus;
+ this.drpViolationLevel.SelectedValue = violationPerson.ViolationLevel;
+
}
}
else
@@ -292,6 +295,9 @@ namespace FineUIPro.Web.Check
violationPerson.CompileMan = this.CurrUser.UserId;
violationPerson.CompileDate = DateTime.Now;
violationPerson.States = BLL.Const.State_2;
+ violationPerson.RectificationStatus = this.drpRectificationStatus.SelectedValue.Trim();
+ violationPerson.ViolationLevel = this.drpViolationLevel.SelectedValue.Trim();
+
if (!string.IsNullOrEmpty(this.ViolationPersonId))
{
violationPerson.ViolationPersonId = this.ViolationPersonId;
@@ -314,7 +320,13 @@ namespace FineUIPro.Web.Check
SitePersonPerson.OutResult = drpHandleStep.SelectedText;
Funs.DB.SubmitChanges();
}
-
+ //更新三库违章作业
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateViolationRecord(this.ViolationPersonId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
}
#endregion
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.designer.cs
index 5b7ec88..c3a764d 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonEdit.aspx.designer.cs
@@ -1,221 +1,241 @@
//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.Check {
-
-
- public partial class ViolationPersonEdit {
-
+namespace FineUIPro.Web.Check
+{
+
+
+ public partial class ViolationPersonEdit
+ {
+
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
- /// SimpleForm1 控件。
+ /// SimpleForm1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
- /// txtViolationPersonCode 控件。
+ /// txtViolationPersonCode control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtViolationPersonCode;
-
+
///
- /// drpPersonId 控件。
+ /// drpPersonId control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownBox drpPersonId;
-
+
///
- /// Grid1 控件。
+ /// Grid1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Grid Grid1;
-
+
///
- /// Toolbar2 控件。
+ /// Toolbar2 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar2;
-
+
///
- /// txtSelectUnitName 控件。
+ /// txtSelectUnitName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtSelectUnitName;
-
+
///
- /// txtCardNo 控件。
+ /// txtCardNo control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtCardNo;
-
+
///
- /// txtPersonName 控件。
+ /// txtPersonName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtPersonName;
-
+
///
- /// txtUnitName 控件。
+ /// txtUnitName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtUnitName;
-
+
///
- /// txtWorkPostName 控件。
+ /// txtWorkPostName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtWorkPostName;
-
+
///
- /// hdUnitId 控件。
+ /// hdUnitId control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.HiddenField hdUnitId;
-
+
///
- /// hdWorkPostId 控件。
+ /// hdWorkPostId control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.HiddenField hdWorkPostId;
-
+
///
- /// txtViolationDate 控件。
+ /// drpViolationName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtViolationDate;
-
- ///
- /// drpViolationName 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList drpViolationName;
-
+
///
- /// drpViolationType 控件。
+ /// drpViolationType control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList drpViolationType;
-
+
///
- /// drpHandleStep 控件。
+ /// drpViolationLevel control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpViolationLevel;
+
+ ///
+ /// drpRectificationStatus control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpRectificationStatus;
+
+ ///
+ /// drpHandleStep control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.DropDownList drpHandleStep;
-
+
///
- /// txtViolationDef 控件。
+ /// txtViolationDate control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DatePicker txtViolationDate;
+
+ ///
+ /// txtViolationDef control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextArea txtViolationDef;
-
+
///
- /// Toolbar1 控件。
+ /// Toolbar1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
- /// ToolbarFill1 控件。
+ /// ToolbarFill1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+
///
- /// btnSave 控件。
+ /// btnSave control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnSave;
-
+
///
- /// btnClose 控件。
+ /// btnClose control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnClose;
}
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx
index dac6169..19d055f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx
@@ -24,6 +24,14 @@
+
+
+
+
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.cs
index af6feb3..0896a2f 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.cs
@@ -102,6 +102,9 @@ namespace FineUIPro.Web.Check
}
}
this.txtViolationDef.Text = violationPerson.ViolationDef;
+ this.txtViolationLevel.Text = violationPerson.ViolationLevel;
+ this.txtRectificationStatus.Text = violationPerson.RectificationStatus;
+
}
}
}
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.designer.cs
index 347978a..61d98d3 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Check/ViolationPersonView.aspx.designer.cs
@@ -1,149 +1,169 @@
//------------------------------------------------------------------------------
-// <自动生成>
-// 此代码由工具生成。
+//
+// This code was generated by a tool.
//
-// 对此文件的更改可能导致不正确的行为，如果
-// 重新生成代码，则所做更改将丢失。
-//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.Check {
-
-
- public partial class ViolationPersonView {
-
+namespace FineUIPro.Web.Check
+{
+
+
+ public partial class ViolationPersonView
+ {
+
///
- /// form1 控件。
+ /// form1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
- /// PageManager1 控件。
+ /// PageManager1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
- /// SimpleForm1 控件。
+ /// SimpleForm1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
- /// txtViolationPersonCode 控件。
+ /// txtViolationPersonCode control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtViolationPersonCode;
-
+
///
- /// txtPersonName 控件。
+ /// txtPersonName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtPersonName;
-
+
///
- /// txtUnitName 控件。
+ /// txtRectificationStatus control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtRectificationStatus;
+
+ ///
+ /// txtViolationLevel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtViolationLevel;
+
+ ///
+ /// txtUnitName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtUnitName;
-
+
///
- /// txtWorkPostName 控件。
+ /// txtWorkPostName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtWorkPostName;
-
+
///
- /// txtViolationDate 控件。
+ /// txtViolationDate control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtViolationDate;
-
+
///
- /// txtViolationName 控件。
+ /// txtViolationName control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtViolationName;
-
+
///
- /// txtViolationType 控件。
+ /// txtViolationType control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtViolationType;
-
+
///
- /// txtHandleStep 控件。
+ /// txtHandleStep control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextBox txtHandleStep;
-
+
///
- /// txtViolationDef 控件。
+ /// txtViolationDef control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.TextArea txtViolationDef;
-
+
///
- /// Toolbar1 控件。
+ /// Toolbar1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
- /// ToolbarFill1 控件。
+ /// ToolbarFill1 control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+
///
- /// btnClose 控件。
+ /// btnClose control.
///
///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
///
protected global::FineUIPro.Button btnClose;
}
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs
index ecf4b76..9b90c5e 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/EduTrain/TrainRecordEdit.aspx.cs
@@ -351,6 +351,13 @@ namespace FineUIPro.Web.HSSE.EduTrain
BLL.EduTrain_TrainRecordDetailService.UpdateTrainDetail(detail);
}
}
+ //更新三库教育培训
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateTrainingRecord(this.TrainingId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
}
#endregion
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
index 3e5883e..bc641aa 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
@@ -323,6 +323,14 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
register.CheckTime = Funs.GetNewDateTimeOrNow(this.txtCheckTime.Text.Trim());
register.ControlId = Request.Params["ControlId"];
BLL.HSSE_Hazard_HazardRegisterService.AddHazardRegister(register);
+ //更新三库网格化巡查
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateGridPatrolRecord(this.HazardRegisterId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+
BLL.LogService.AddSys_Log(this.CurrUser, register.HazardCode, register.HazardRegisterId, BLL.Const.HiddenRectificationMenuId, BLL.Const.BtnAdd);
}
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.SupervisionAndInspection);
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx
index a1c0ca7..e79a1d3 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx
@@ -31,6 +31,15 @@
+
+
+
+
+
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs
index 3cf1948..f7f9db4 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs
@@ -50,6 +50,8 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.ProjectId = this.CurrUser.LoginProjectId;
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+ UnitService.InitUnitDropDownList(this.drpUnit, this.CurrUser.LoginProjectId, false);
+
//类型
BLL.ConstValue.InitConstValueDropDownList(this.drpHazardType, ConstValue.Group_LargerHazardType, true);
//是否需要专家论证
@@ -68,6 +70,17 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.drpHazardType.SelectedValue = largerHazard.HazardType;
}
+ if (!string.IsNullOrEmpty(largerHazard.UnitId))
+ {
+ this.drpUnit.SelectedValue = largerHazard.UnitId;
+ //根据单位和项目获取人员
+ BLL.PersonService.InitPersonByProjectUnitDropDownList(this.drpStandbyPersonnel, largerHazard.ProjectId, largerHazard.UnitId, false);
+ if (!string.IsNullOrEmpty(largerHazard.StandbyPersonnelId))
+ {
+ this.drpStandbyPersonnel.SelectedValue = largerHazard.StandbyPersonnelId;
+ }
+ }
+
this.txtAddress.Text = largerHazard.Address;
if (largerHazard.ExpectedTime != null)
{
@@ -131,6 +144,17 @@ namespace FineUIPro.Web.HSSE.Solution
ShowNotify("请选择类型！", MessageBoxIcon.Warning);
return;
}
+ if (string.IsNullOrWhiteSpace(this.drpStandbyPersonnel.SelectedValue))
+ {
+ ShowNotify("请选择旁站人员！", MessageBoxIcon.Warning);
+ return;
+ }
+ if (string.IsNullOrWhiteSpace(this.drpUnit.SelectedValue))
+ {
+ ShowNotify("请选择施工单位！", MessageBoxIcon.Warning);
+ return;
+ }
+
this.SaveData(BLL.Const.BtnSave);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
}
@@ -159,6 +183,9 @@ namespace FineUIPro.Web.HSSE.Solution
States = this.drpStates.SelectedValue,
HazardName=txtHazardName.Text.Trim(),
ApprovalState = this.drpApprovalState.SelectedValue,
+ UnitId = this.drpUnit.SelectedValue,
+ StandbyPersonnelId = this.drpStandbyPersonnel.SelectedValue,
+
};
if (!string.IsNullOrEmpty(this.HazardId))
@@ -205,6 +232,14 @@ namespace FineUIPro.Web.HSSE.Solution
}
#endregion
}
+ //更新三库危大工程
+ string message = string.Empty;
+ SanKuDataSummaryReportService.UpdateDangerousEngineeringRecord(this.HazardId, ref message);
+ if (!string.IsNullOrWhiteSpace(message))
+ {
+ ShowNotify(message, MessageBoxIcon.Warning);
+ }
+
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.ProjectInformation);
//Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.DangerousProject);
}
@@ -386,5 +421,20 @@ namespace FineUIPro.Web.HSSE.Solution
BLL.LargerHazardService.AddLargerHazard(largerHazard);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId,BLL.Const.ProjectLargerHazardListMenuId,BLL.Const.BtnAdd);
}
+
+ ///
+ /// 单位下拉框事件
+ ///
+ ///
+ ///
+ protected void drpUnit_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ if (!string.IsNullOrEmpty(this.drpUnit.SelectedValue))
+ {
+ //根据单位和项目获取人员
+ BLL.PersonService.InitPersonByProjectUnitDropDownList(this.drpStandbyPersonnel, this.CurrUser.LoginProjectId, this.drpUnit.SelectedValue, false);
+ }
+ }
+
}
}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs
index c0e386a..60834a0 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.designer.cs
@@ -77,6 +77,33 @@ namespace FineUIPro.Web.HSSE.Solution
///
protected global::FineUIPro.DatePicker txtExpectedTime;
+ ///
+ /// drpUnit control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpUnit;
+
+ ///
+ /// drpStandbyPersonnel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.DropDownList drpStandbyPersonnel;
+
+ ///
+ /// Label7 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.Label Label7;
+
///
/// rblIsArgument control.
///
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx
index 6e5b31c..ccacf3c 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx
@@ -131,9 +131,9 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs
index d03e1d8..b2825e1 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.cs
@@ -74,6 +74,14 @@ namespace FineUIPro.Web.HSSE.Solution
{
this.txtTrainPersonNum.Text = largerHazard.TrainPersonNum.ToString();
}
+ if (!string.IsNullOrWhiteSpace(largerHazard.UnitId))
+ {
+ this.txtUnitName.Text = UnitService.getUnitNamesUnitIds(largerHazard.UnitId);
+ }
+ if (!string.IsNullOrWhiteSpace(largerHazard.StandbyPersonnelId))
+ {
+ this.txtStandbyPersonnel.Text = PersonService.GetPersonNameById(largerHazard.StandbyPersonnelId);
+ }
this.drpStates.SelectedValue = largerHazard.States;
this.txtDescriptions.Text = largerHazard.Descriptions;
this.txtRemark.Text = HttpUtility.HtmlDecode(largerHazard.Remark);
diff --git a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs
index 6ae3625..049edc1 100644
--- a/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/HSSE/Solution/LargerHazardView.aspx.designer.cs
@@ -77,6 +77,33 @@ namespace FineUIPro.Web.HSSE.Solution
///
protected global::FineUIPro.TextBox txtExpectedTime;
+ ///
+ /// txtUnitName control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtUnitName;
+
+ ///
+ /// txtStandbyPersonnel control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.TextBox txtStandbyPersonnel;
+
+ ///
+ /// Label7 control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::FineUIPro.Label Label7;
+
///
/// txtIsArgument control.
///
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx b/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx
new file mode 100644
index 0000000..dded430
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx
@@ -0,0 +1,28 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DataGovernance.aspx.cs" Inherits="FineUIPro.Web.ProjectData.DataGovernance" %>
+
+
+
+
+
+
+ 数据治理监控
+
+
+
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx.cs b/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx.cs
new file mode 100644
index 0000000..7f03536
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx.cs
@@ -0,0 +1,55 @@
+using BLL;
+using Newtonsoft.Json;
+using System;
+using System.Linq;
+using System.Web.Security;
+
+namespace FineUIPro.Web.ProjectData
+{
+ public partial class DataGovernance : PageBase
+ {
+
+
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ //string url = "../DataGovernance/index.html";
+ //string url = "https://qhse.cncecoa.com/HSE/DataGovernance/index.html";
+ //string url = "https://lygcgs.com.cn:8078/QHSE/DataGovernance/index.html";
+ //string url = "https://lygcgs.com.cn:8078/QHSE/FileUpload/DataGovernance/index.html";
+ //string roleName = RoleService.getRoleNamesRoleIds(this.CurrUser.RoleId);
+ //if (roleName.Contains("公司领导") || roleName.Contains("公司管理") || this.CurrUser.UserId == Const.sysglyId || this.CurrUser.UserId == Const.hfnbdId)
+ //{
+ // url += "?type=1,2";
+ //}
+ //else
+ //{
+ // //url += "?type=1";
+ // if (FormsAuthentication.LoginUrl.Contains("Hsse"))
+ // {
+ // url += "?type=1";
+ // }
+ // else
+ // {
+ // url += "?type=2";
+ // }
+ //}
+ string url = "https://qhse.cncecoa.com/QHSE/FileUpload/DataGovernance/index.html?type=1,2";
+ var thisUnit = CommonService.GetIsThisUnit();
+ url = $"{url}&fromUnit={thisUnit.UnitId}&random={DateTime.Now.ToString("yyyyMMddHHmmss")}-{new Random().Next(1000, 9999)}";
+ ifDataGovernance.Src = url;
+ //Response.Write("");
+ }
+ }
+
+ #endregion
+
+ }
+}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx.designer.cs
new file mode 100644
index 0000000..a5fe8b3
--- /dev/null
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/DataGovernance.aspx.designer.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.ProjectData
+{
+
+
+ public partial class DataGovernance
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// ContentPanel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ContentPanel ContentPanel1;
+
+ ///
+ /// ifDataGovernance 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlIframe ifDataGovernance;
+ }
+}
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx
index e6db891..50942a2 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx
@@ -83,6 +83,13 @@
+
+
+
+
+
+
@@ -162,6 +169,9 @@
--%>
+
+
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
index 7d5bd85..3fcf1bf 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs
@@ -69,7 +69,8 @@ namespace FineUIPro.Web.ProjectData
Pro_id = x.Pro_id,
Pro_name = x.Pro_name,
Pro_code = x.Pro_code,
- Start_date = x.Start_date,
+ //Start_date = x.Start_date,
+ Start_date = x.Start_date != null ? ((DateTime)x.Start_date).ToString("yyyy-MM-dd") : "",
Con_mode_desc = x.Con_mode_desc,
Pro_nature = x.Pro_nature,
Pro_status = x.Pro_status,
@@ -88,6 +89,13 @@ namespace FineUIPro.Web.ProjectData
Reason = use != null ? use.Reason : "",
//Situation = use != null ? use.Situation : "",
//Remark = use != null ? use.Remark : "",
+ HandleMan = use != null ? use.HandleMan : "",
+ //HandleManName = use != null ? use.HandleManName : "",
+ //HandleState = use != null ? use.HandleState != null ? int.Parse(use.HandleState) : -1 : -1,
+ //0：不通过、1：通过，-1：未审核
+ HandleState = use != null && use.HandleMan != null ? use.HandleState != null ? int.Parse(use.HandleState) : -1 : -2,
+ //HandleStateStr = use != null ? use.HandleMan != null ? $"{use.HandleManName}[{(int.Parse(use.HandleState) == 1 ? "通过" : int.Parse(use.HandleState) == 0 ? "不通过" : "未审核")}]{()}" : "" : "",
+ HandleStr = ConvertHandleStr(use),
}).ToList();
string startDate = this.txtStartTime.Text.Trim();
@@ -134,6 +142,9 @@ namespace FineUIPro.Web.ProjectData
Reason = "",
//Situation = use != null ? use.Situation : "",
//Remark = use != null ? use.Remark : "",
+ HandleMan = "",
+ HandleState = -2,
+ HandleStr = ""
});
}
@@ -141,6 +152,23 @@ namespace FineUIPro.Web.ProjectData
string proCode = this.txtProCode.Text.Trim();
string projectName = this.txtProjectName.Text.Trim();
string projectCode = this.txtProjectCode.Text.Trim();
+
+ //0：不通过、1：通过，-1：未审核
+ int auditWait = int.Parse(this.rblAuditWait.SelectedValue);
+ if (auditWait == 1)
+ {//已审核
+ list = list.Where(x => x.HandleState == 1 || x.HandleState == 0).ToList();
+ }
+ else if (auditWait == 2)
+ {//待审核
+ list = list.Where(x => x.HandleState == -1 && !string.IsNullOrWhiteSpace(x.HandleMan)).ToList();
+ }
+ else if (auditWait == 3)
+ {//待本人审核
+ list = list.Where(x => x.HandleState == -1 && !string.IsNullOrWhiteSpace(x.HandleMan) && x.HandleMan == this.CurrUser.UserId).ToList();
+ }
+
+
int relate = int.Parse(this.rblIsRelate.SelectedValue);
if (!string.IsNullOrEmpty(proName))
@@ -215,6 +243,30 @@ namespace FineUIPro.Web.ProjectData
Grid1.SummaryData = summary;
}
+ ///
+ /// 审核信息
+ ///
+ ///
+ ///
+ protected string ConvertHandleStr(Project_MasterDataUsage use)
+ {
+ string result = string.Empty;
+ if (use != null && !string.IsNullOrWhiteSpace(use.HandleManName))
+ {
+ //result = $"{use.HandleManName}；{(int.Parse(use.HandleState) == 1 ? "通过" : int.Parse(use.HandleState) == 0 ? "不通过" : "未审核")}；{(use.HandleState != null ? ((DateTime)use.HandleDate).ToString("yyyy-MM-dd HH:mm") : "")}";
+ if (use.HandleState != null)
+ {
+ result = $"{use.HandleManName}；{(int.Parse(use.HandleState) == 1 ? "通过" : int.Parse(use.HandleState) == 0 ? "不通过" : "未审核")}；{(use.HandleState != null ? ((DateTime)use.HandleDate).ToString("yyyy-MM-dd HH:mm") : "")}";
+ }
+ else
+ {
+ result = $"{use.HandleManName}；未审核";
+ }
+ }
+ return result;
+ }
+
+
///
/// 合同额（亿）
///
@@ -286,7 +338,7 @@ namespace FineUIPro.Web.ProjectData
string startDate = obj[13].ToString().Trim();
string lblState = (Grid1.SelectedRow.FindControl("lblState") as AspNet.Label).Text.Trim();
- if (!string.IsNullOrWhiteSpace(pro_id))
+ if (!string.IsNullOrWhiteSpace(pro_id) && string.IsNullOrWhiteSpace(projectId))
{
var masterUsage = Funs.DB.Project_MasterDataUsage.Where(x => x.Pro_id == pro_id).FirstOrDefault();
if (masterUsage != null)
@@ -425,7 +477,7 @@ namespace FineUIPro.Web.ProjectData
ProjectId = x.ProjectId,
ReportDate = x.ReportDate,
//DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0)
- DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0) + (x.LicensesNum ?? 0)
+ DataMetricsSum = (x.JoinConstructionPersonNum ?? 0) + (x.GeneralClosedNum ?? 0) + (x.GeneralNotClosedNum ?? 0) + (x.SafeWorkingHour ?? 0) + (x.LicensesNum ?? 0)
+ (x.SpecialTrainNum ?? 0) + (x.SpecialOperationTrainNum ?? 0) + (x.ProjectSafetyLeadingGroupMeetingNum ?? 0) + (x.ProjectSafetyMeetingNum ?? 0)
+ (x.GeneralRiskNum ?? 0) + (x.LowRiskNum ?? 0) + (x.MediumRiskNum ?? 0) + (x.HighRiskNum ?? 0)
+ (x.TrainPersonNum ?? 0) + (x.SuperTrainPersonNum ?? 0) + (x.OperativesNum ?? 0) + (x.SuperOperativesNum ?? 0) + (x.ProjectDrillPersonNum ?? 0)
@@ -433,10 +485,15 @@ namespace FineUIPro.Web.ProjectData
foreach (var pro in getProjects)
{
+ bool threeMonNoChange = false;
+ bool monNoChange = false;
+ bool weekNoChange = false;
+ bool dayNoChange = false;
+
string threeMonResult = "";
string monResult = "";
- string dayResult = "";
string weekResult = "";
+ string dayResult = "";
var nowData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateNow).FirstOrDefault();
var daysData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateDays).FirstOrDefault();
var weekData = datas.Where(x => x.ProjectId == pro.ProjectId && x.ReportDate == dateWeek).FirstOrDefault();
@@ -446,27 +503,31 @@ namespace FineUIPro.Web.ProjectData
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == daysData.DataMetricsSum)
{
+ dayNoChange = true;
dayResult = "数据无变化";
}
}
- if (nowData != null && weekData != null)
+ if (dayNoChange && nowData != null && weekData != null)
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == weekData.DataMetricsSum)
{
+ weekNoChange = true;
weekResult = "数据无变化";
}
}
- if (nowData != null && monthData != null)
+ if (dayNoChange && weekNoChange && nowData != null && monthData != null)
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == monthData.DataMetricsSum)
{
+ monNoChange = true;
monResult = "数据无变化";
}
}
- if (nowData != null && threeMonthData != null)
+ if (dayNoChange && weekNoChange && monNoChange && nowData != null && threeMonthData != null)
{//两个时间点都有指标数据
if (nowData.DataMetricsSum == threeMonthData.DataMetricsSum)
{
+ threeMonNoChange = true;
threeMonResult = "数据无变化";
}
}
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs
index acdb82d..4996def 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs
@@ -149,6 +149,15 @@ namespace FineUIPro.Web.ProjectData
///
protected global::FineUIPro.TextBox txtProjectName;
+ ///
+ /// rblAuditWait 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblAuditWait;
+
///
/// btnOut 控件。
///
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx
index 423b562..9ca17c0 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx
@@ -32,79 +32,13 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ EnableTextSelection="True" AllowColumnLocking="true">
@@ -138,14 +72,13 @@
-
+
+ FieldType="String" HeaderText="分类" HeaderTextAlign="Center" TextAlign="Center" Locked="true">
@@ -196,13 +129,84 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ EnableTextSelection="True" AllowColumnLocking="true">
@@ -226,20 +230,19 @@
-
+
+ FieldType="String" HeaderText="分类" HeaderTextAlign="Center" TextAlign="Center" Locked="true">
-
+
+ FieldType="String" HeaderText="项目编号" HeaderTextAlign="Center" TextAlign="Left" Locked="true">
@@ -275,7 +278,7 @@
EnableCollapse="true" runat="server" BoxFlex="1" EnableColumnLines="true" EnableSummary="false" SummaryPosition="Bottom"
DataKeyNames="Id" DataIDField="Id" AllowSorting="true" SortField="ReportDate DESC,DataDate" SortDirection="DESC"
OnSort="Grid9_Sort" AllowPaging="false" IsDatabasePaging="false" PageSize="1000000" OnPageIndexChange="Grid9_PageIndexChange"
- EnableTextSelection="True">
+ EnableTextSelection="True" AllowColumnLocking="true">
@@ -294,62 +297,64 @@
-
+
-
+
-
+
+
+
+
+
-
-
- <%--
-
-
- --%>
-
-
-
-
-
-
-
+
+ <%--
+ --%>
+
+
+
+
+
+ FieldType="String" HeaderText="待上线" HeaderTextAlign="Center" TextAlign="Center">
-
+ --%>
+
+
+
-
+
-
-
+
-
-
-
+
@@ -359,7 +364,7 @@
-
+
@@ -369,7 +374,7 @@
-
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.cs b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.cs
index 757d477..47440e7 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.cs
@@ -6,7 +6,6 @@ using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text;
-using System.Web.UI.DataVisualization.Charting;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ProjectData
@@ -50,17 +49,17 @@ namespace FineUIPro.Web.ProjectData
{
if (TabStrip1.ActiveTabIndex == 0)
{
- this.Panel1.Title = "未使用项目";
- this.BindGrid2();
+ this.Panel1.Title = "已上线项目";
+ this.BindGrid();
}
else if (TabStrip1.ActiveTabIndex == 1)
{
- this.Panel1.Title = "已使用项目";
- this.BindGrid();
+ this.Panel1.Title = "未上线项目";
+ this.BindGrid2();
}
else if (TabStrip1.ActiveTabIndex == 2)
{
- this.Panel1.Title = "申请不用项目";
+ this.Panel1.Title = "申请关闭项目";
this.BindGrid3();
}
else if (TabStrip1.ActiveTabIndex == 3)
@@ -102,132 +101,7 @@ namespace FineUIPro.Web.ProjectData
return result;
}
- #region 未使用项目——待建数据
-
-
- #region 绑定数据
- ///
- /// 绑定数据
- ///
- private void BindGrid2()
- {
- var list = new List();
- var db = Funs.DB;
- var query = (from x in masterProDatas
- join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup
- from pro in proGroup.DefaultIfEmpty()
- join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup
- from use in useGroup.DefaultIfEmpty()
- where pro == null && (use == null || (use != null && (use.Reason == null || use.Reason == "")))
- select new MasterProjectDataInfo
- {
- //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}",
- //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}",
- Pid = x.Pro_id,
- Pro_id = x.Pro_id,
- Pro_Classify = "待建",
- Pro_name = x.Pro_name,
- Pro_code = x.Pro_code,
- Start_date = x.Start_date,
- Con_mode_desc = x.Con_mode_desc,
- Pro_nature = x.Pro_nature,
- Pro_status = x.Pro_status,
- Org_name = x.Org_name,
- Amount = ConvertAmount(x.Ori_amt_sum_vat_fc, x.Amt_add_sum_vat_fc_local)
- }).ToList();
-
- string startDate = this.txtStartTime2.Text.Trim();
- string endDate = this.txtEndTime2.Text.Trim();
- if (!string.IsNullOrWhiteSpace(startDate))
- {
- query = query.Where(x => Funs.GetNewDateTime(x.Start_date) >= Funs.GetNewDateTime(startDate)).ToList();
- }
- if (!string.IsNullOrWhiteSpace(endDate))
- {
- query = query.Where(x => Funs.GetNewDateTime(x.Start_date) <= Funs.GetNewDateTime(endDate)).ToList();
- }
- query = query.OrderByDescending(x => x.StartDate).ToList();
- list.AddRange(query);
-
- string proName = this.txtProName2.Text.Trim();
- string proCode = this.txtProCode2.Text.Trim();
-
- if (!string.IsNullOrEmpty(proName))
- {
- list = list.Where(x => x.Pro_name.Contains(proName)).ToList();
- }
- if (!string.IsNullOrEmpty(proCode))
- {
- list = list.Where(x => x.Pro_code.Contains(proCode)).ToList();
- }
-
- DataTable tb = Funs.LINQToDataTable(list);
- Grid2.RecordCount = tb.Rows.Count;
- var table = this.GetPagedDataTable(Grid2, tb);
- Grid2.DataSource = table;
- Grid2.DataBind();
-
- int totalNum = list.Count();
- JObject summary = new JObject();
- summary.Add("tfPageIndex", "合计");
- summary.Add("Pro_Classify", totalNum);
- summary.Add("Pro_name", $"待建：{totalNum}");
-
- Grid2.SummaryData = summary;
- }
-
- #endregion
-
- #region Grid
-
- protected void TextBox2_TextChanged(object sender, EventArgs e)
- {
- this.BindGrid2();
- }
-
- ///
- ///
- ///
- ///
- ///
- protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
- {
- this.BindGrid2();
- }
-
-
- protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
- {
- this.BindGrid2();
- }
- #endregion
-
- #region 导出按钮
-
- ///
- /// 导出按钮
- ///
- ///
- ///
- protected void btnOut2_Click(object sender, EventArgs e)
- {
- Response.ClearContent();
- string filename = Funs.GetNewFileName();
- Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("集团主数据在建项目数据分析（未使用项目）" + filename, System.Text.Encoding.UTF8) + ".xls");
- Response.ContentType = "application/excel";
- Response.ContentEncoding = System.Text.Encoding.UTF8;
- this.Grid2.PageSize = this.Grid2.RecordCount;
- this.BindGrid2();
- Response.Write(GetGridMultiHeaderTableHtml2(Grid2));
- //Response.Write(GetGridTableHtml(Grid2));
- Response.End();
- }
- #endregion
-
- #endregion
-
-
- #region 已使用项目——已关联和预立项项目
+ #region 已上线项目——已关联和待关联（预立项）项目
#region 绑定数据
@@ -253,7 +127,8 @@ namespace FineUIPro.Web.ProjectData
Pro_Classify = "已关联",
Pro_name = x.Pro_name,
Pro_code = x.Pro_code,
- Start_date = x.Start_date,
+ //Start_date = x.Start_date,
+ Start_date = x.Start_date != null ? ((DateTime)x.Start_date).ToString("yyyy-MM-dd") : "",
Con_mode_desc = x.Con_mode_desc,
Pro_nature = x.Pro_nature,
Pro_status = x.Pro_status,
@@ -278,7 +153,7 @@ namespace FineUIPro.Web.ProjectData
{
Pid = x.ProjectId,
ProjectId = x.ProjectId,
- Pro_Classify = "预立项",
+ Pro_Classify = "待关联",
ProjectName = x.ProjectName,
ProjectCode = x.ProjectCode,
StartDate = x.StartDate,
@@ -327,7 +202,7 @@ namespace FineUIPro.Web.ProjectData
//}
int yiGuanLianNum = list.Where(x => x.Pro_Classify == "已关联").Count();
- int yuLiXiangNum = list.Where(x => x.Pro_Classify == "预立项").Count();
+ int yuLiXiangNum = list.Where(x => x.Pro_Classify == "待关联").Count();
DataTable tb = Funs.LINQToDataTable(list);
Grid1.RecordCount = tb.Rows.Count;
@@ -339,7 +214,7 @@ namespace FineUIPro.Web.ProjectData
JObject summary = new JObject();
summary.Add("tfNumber", "合计");
summary.Add("Pro_Classify", totalNum);
- summary.Add("Pro_name", $"已关联：{yiGuanLianNum}；预立项：{yuLiXiangNum}");
+ summary.Add("Pro_name", $"已关联：{yiGuanLianNum}；待关联：{yuLiXiangNum}");
Grid1.SummaryData = summary;
}
@@ -395,7 +270,7 @@ namespace FineUIPro.Web.ProjectData
{
Response.ClearContent();
string filename = Funs.GetNewFileName();
- Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("集团主数据在建项目数据分析（已使用项目）" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("集团主数据在建项目数据分析（已上线项目）" + filename, System.Text.Encoding.UTF8) + ".xls");
Response.ContentType = "application/excel";
Response.ContentEncoding = System.Text.Encoding.UTF8;
this.Grid1.PageSize = this.Grid1.RecordCount;
@@ -408,7 +283,139 @@ namespace FineUIPro.Web.ProjectData
#endregion
- #region 申请不用数据
+
+ #region 未上线项目——待上线（待建）、停缓建、条件受限数据
+
+
+ #region 绑定数据
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid2()
+ {
+ var list = new List();
+ var db = Funs.DB;
+ var query = (from x in masterProDatas
+ join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup
+ from pro in proGroup.DefaultIfEmpty()
+ join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup
+ from use in useGroup.DefaultIfEmpty()
+ where pro == null && (use == null || (use != null && (use.ReasonType == null || use.ReasonType == "停缓建" || use.ReasonType == "条件受限")))
+ select new MasterProjectDataInfo
+ {
+ //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}",
+ //Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}",
+ Pid = x.Pro_id,
+ Pro_id = x.Pro_id,
+ Pro_Classify = (use == null || (use != null && (use.ReasonType == null))) ? "待上线" : use.ReasonType,
+ Pro_name = x.Pro_name,
+ Pro_code = x.Pro_code,
+ //Start_date = x.Start_date,
+ Start_date = x.Start_date != null ? ((DateTime)x.Start_date).ToString("yyyy-MM-dd") : "",
+ Con_mode_desc = x.Con_mode_desc,
+ Pro_nature = x.Pro_nature,
+ Pro_status = x.Pro_status,
+ Org_name = x.Org_name,
+ Amount = ConvertAmount(x.Ori_amt_sum_vat_fc, x.Amt_add_sum_vat_fc_local),
+ ReasonType = use != null ? use.ReasonType : "",
+ Reason = use != null ? use.Reason : "",
+ }).ToList();
+
+ string startDate = this.txtStartTime2.Text.Trim();
+ string endDate = this.txtEndTime2.Text.Trim();
+ if (!string.IsNullOrWhiteSpace(startDate))
+ {
+ query = query.Where(x => Funs.GetNewDateTime(x.Start_date) >= Funs.GetNewDateTime(startDate)).ToList();
+ }
+ if (!string.IsNullOrWhiteSpace(endDate))
+ {
+ query = query.Where(x => Funs.GetNewDateTime(x.Start_date) <= Funs.GetNewDateTime(endDate)).ToList();
+ }
+ query = query.OrderByDescending(x => x.StartDate).ToList();
+ list.AddRange(query);
+
+ string proName = this.txtProName2.Text.Trim();
+ string proCode = this.txtProCode2.Text.Trim();
+
+ if (!string.IsNullOrEmpty(proName))
+ {
+ list = list.Where(x => x.Pro_name.Contains(proName)).ToList();
+ }
+ if (!string.IsNullOrEmpty(proCode))
+ {
+ list = list.Where(x => x.Pro_code.Contains(proCode)).ToList();
+ }
+
+ DataTable tb = Funs.LINQToDataTable(list);
+ Grid2.RecordCount = tb.Rows.Count;
+ var table = this.GetPagedDataTable(Grid2, tb);
+ Grid2.DataSource = table;
+ Grid2.DataBind();
+
+ int totalNum = list.Count();
+ int daiShangXianNum = list.Where(x => x.Pro_Classify == "待上线").Count();
+ int tingHuanJianNum = list.Where(x => x.Pro_Classify == "停缓建").Count();
+ int tiaoJianShouXianNum = list.Where(x => x.Pro_Classify == "条件受限").Count();
+ JObject summary = new JObject();
+ summary.Add("tfPageIndex", "合计");
+ summary.Add("Pro_Classify", totalNum);
+ summary.Add("Pro_name", $"待上线：{daiShangXianNum}；停缓建：{tingHuanJianNum}；条件受限：{tiaoJianShouXianNum}");
+
+ Grid2.SummaryData = summary;
+ }
+
+ #endregion
+
+ #region Grid
+
+ protected void TextBox2_TextChanged(object sender, EventArgs e)
+ {
+ this.BindGrid2();
+ }
+
+ ///
+ ///
+ ///
+ ///
+ ///
+ protected void Grid2_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ this.BindGrid2();
+ }
+
+
+ protected void Grid2_Sort(object sender, FineUIPro.GridSortEventArgs e)
+ {
+ this.BindGrid2();
+ }
+ #endregion
+
+ #region 导出按钮
+
+ ///
+ /// 导出按钮
+ ///
+ ///
+ ///
+ protected void btnOut2_Click(object sender, EventArgs e)
+ {
+ Response.ClearContent();
+ string filename = Funs.GetNewFileName();
+ Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("集团主数据在建项目数据分析（未上线项目）" + filename, System.Text.Encoding.UTF8) + ".xls");
+ Response.ContentType = "application/excel";
+ Response.ContentEncoding = System.Text.Encoding.UTF8;
+ this.Grid2.PageSize = this.Grid2.RecordCount;
+ this.BindGrid2();
+ Response.Write(GetGridMultiHeaderTableHtml2(Grid2));
+ //Response.Write(GetGridTableHtml(Grid2));
+ Response.End();
+ }
+ #endregion
+
+ #endregion
+
+
+ #region 申请关闭数据
#region 绑定数据
@@ -424,17 +431,19 @@ namespace FineUIPro.Web.ProjectData
from pro in proGroup.DefaultIfEmpty()
join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup
from use in useGroup.DefaultIfEmpty()
- where pro == null && use != null && use.Is_use == false && use.Reason != null && use.Reason != ""
+ where pro == null && use != null && use.Is_use == false && use.ReasonType != null && use.ReasonType != "停缓建" && use.ReasonType != "条件受限"
select new MasterProjectDataInfo
{
//Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}",
//Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}",
Pid = x.Pro_id,
Pro_id = x.Pro_id,
- Pro_Classify = use != null ? (use.ReasonType == "已完工" ? "已完工" : use.ReasonType == "停缓建" ? "停缓建" : "条件受限") : "",
+ //Pro_Classify = use != null ? (use.ReasonType == "已完工/撤场" ? "已完工/撤场" : use.ReasonType == "停缓建" ? "停缓建" : use.ReasonType == "不适用" ? "不适用" : "条件受限") : "",
+ Pro_Classify = use != null ? use.ReasonType : "",
Pro_name = x.Pro_name,
Pro_code = x.Pro_code,
- Start_date = x.Start_date,
+ //Start_date = x.Start_date,
+ Start_date = x.Start_date != null ? ((DateTime)x.Start_date).ToString("yyyy-MM-dd") : "",
Con_mode_desc = x.Con_mode_desc,
Pro_nature = x.Pro_nature,
Pro_status = x.Pro_status,
@@ -469,9 +478,6 @@ namespace FineUIPro.Web.ProjectData
list = list.Where(x => x.Pro_code.Contains(proCode)).ToList();
}
- int yiWanGongNum = list.Where(x => x.Pro_Classify == "已完工").Count();
- int tingHuanJianNum = list.Where(x => x.Pro_Classify == "停缓建").Count();
- int tiaoJianShouXianNum = list.Where(x => x.Pro_Classify == "条件受限").Count();
DataTable tb = Funs.LINQToDataTable(list);
Grid3.RecordCount = tb.Rows.Count;
@@ -480,10 +486,13 @@ namespace FineUIPro.Web.ProjectData
Grid3.DataBind();
int totalNum = list.Count();
+ int yiWanGongNum = list.Where(x => x.Pro_Classify == "已完工/撤场").Count();
+ int buShiYong = list.Where(x => x.Pro_Classify == "不适用").Count();
+
JObject summary = new JObject();
summary.Add("tfPageNo", "合计");
summary.Add("Pro_Classify", totalNum);
- summary.Add("Pro_name", $"已完工：{yiWanGongNum}；停缓建：{tingHuanJianNum}；条件受限：{tiaoJianShouXianNum}");
+ summary.Add("Pro_name", $"已完工/撤场：{yiWanGongNum}；不适用：{buShiYong}；");
Grid3.SummaryData = summary;
}
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.designer.cs
index 31afe1d..495b5f7 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysis.aspx.designer.cs
@@ -50,87 +50,6 @@ namespace FineUIPro.Web.ProjectData
///
protected global::FineUIPro.TabStrip TabStrip1;
- ///
- /// Grid2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Grid Grid2;
-
- ///
- /// Toolbar3 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Toolbar Toolbar3;
-
- ///
- /// txtProCode2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtProCode2;
-
- ///
- /// txtProName2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.TextBox txtProName2;
-
- ///
- /// txtStartTime2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtStartTime2;
-
- ///
- /// Label1 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Label Label1;
-
- ///
- /// txtEndTime2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.DatePicker txtEndTime2;
-
- ///
- /// btnOut2 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::FineUIPro.Button btnOut2;
-
- ///
- /// lblPageIndex 控件。
- ///
- ///
- /// 自动生成的字段。
- /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
- ///
- protected global::System.Web.UI.WebControls.Label lblPageIndex;
-
///
/// Grid1 控件。
///
@@ -248,6 +167,87 @@ namespace FineUIPro.Web.ProjectData
///
protected global::System.Web.UI.WebControls.Label lblState;
+ ///
+ /// Grid2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid2;
+
+ ///
+ /// Toolbar3 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar3;
+
+ ///
+ /// txtProCode2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtProCode2;
+
+ ///
+ /// txtProName2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtProName2;
+
+ ///
+ /// txtStartTime2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtStartTime2;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label1;
+
+ ///
+ /// txtEndTime2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DatePicker txtEndTime2;
+
+ ///
+ /// btnOut2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnOut2;
+
+ ///
+ /// lblPageIndex 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label lblPageIndex;
+
///
/// Grid3 控件。
///
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysisOld.aspx.cs b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysisOld.aspx.cs
index b7044c1..af63c20 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysisOld.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataAnalysisOld.aspx.cs
@@ -106,7 +106,8 @@ namespace FineUIPro.Web.ProjectData
Pro_id = x.Pro_id,
Pro_name = x.Pro_name,
Pro_code = x.Pro_code,
- Start_date = x.Start_date,
+ //Start_date = x.Start_date,
+ Start_date = x.Start_date != null ? ((DateTime)x.Start_date).ToString("yyyy-MM-dd") : "",
Con_mode_desc = x.Con_mode_desc,
Pro_nature = x.Pro_nature,
Pro_status = x.Pro_status,
@@ -317,7 +318,8 @@ namespace FineUIPro.Web.ProjectData
Pro_id = x.Pro_id,
Pro_name = x.Pro_name,
Pro_code = x.Pro_code,
- Start_date = x.Start_date,
+ //Start_date = x.Start_date,
+ Start_date = x.Start_date != null ? ((DateTime)x.Start_date).ToString("yyyy-MM-dd") : "",
Con_mode_desc = x.Con_mode_desc,
Pro_nature = x.Pro_nature,
Pro_status = x.Pro_status,
@@ -439,7 +441,8 @@ namespace FineUIPro.Web.ProjectData
Pro_id = x.Pro_id,
Pro_name = x.Pro_name,
Pro_code = x.Pro_code,
- Start_date = x.Start_date,
+ //Start_date = x.Start_date,
+ Start_date = x.Start_date != null ? ((DateTime)x.Start_date).ToString("yyyy-MM-dd") : "",
Con_mode_desc = x.Con_mode_desc,
Pro_nature = x.Pro_nature,
Pro_status = x.Pro_status,
diff --git a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
index fca31a4..ebaa9fd 100644
--- a/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
+++ b/SUBQHSE/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx
@@ -25,6 +25,12 @@
color: #FF7575;
background-image: none;
}
+
+ .customlabel span {
+ margin-left: 40px;
+ color: red;
+ font-weight: bold;
+ }
@@ -63,6 +69,7 @@
+
<%--
@@ -71,17 +78,29 @@
+
+
+ --%>
+ <%--
+
+
+
+
+
+
+
+
+
+
--%>
-
-
-
-
-
+
+
+
-
+
@@ -161,6 +180,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -175,7 +209,6 @@
-