Merge branch 'master' of https://gitee.com/frane-yang/SGGL_CWCEC
This commit is contained in:
commit
81712a5e80
|
|
@ -0,0 +1,153 @@
|
|||
--创建汇总表
|
||||
CREATE TABLE [dbo].[Inspection_Summary](
|
||||
[InspectionSummaryId] [nvarchar](50) NOT NULL,
|
||||
[InspectionSummaryMbId] [nvarchar](50) NULL,
|
||||
[ProjectId] [nvarchar](50) NULL,
|
||||
[SummeryResult] [nvarchar](50) NULL,
|
||||
[CompileDate] [datetime] NULL,
|
||||
[CompileDateMonth] [nvarchar](50) NULL,
|
||||
CONSTRAINT [PK_Inspection_Summary] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[InspectionSummaryId] ASC
|
||||
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
|
||||
) ON [PRIMARY]
|
||||
|
||||
GO
|
||||
|
||||
--创建模板表
|
||||
CREATE TABLE [dbo].[Inspection_SummaryMb](
|
||||
[InspectionSummaryMbId] [nvarchar](50) NOT NULL,
|
||||
[SNumber] [nvarchar](50) NULL,
|
||||
[ModuleName] [nvarchar](50) NULL,
|
||||
[MenuP] [nvarchar](50) NULL,
|
||||
[MenuC] [nvarchar](50) NULL,
|
||||
[SortId] [int] NULL,
|
||||
CONSTRAINT [PK_Inspection_SummaryMb] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[InspectionSummaryMbId] ASC
|
||||
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
|
||||
) ON [PRIMARY]
|
||||
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'序号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Inspection_Summary', @level2type=N'COLUMN',@level2name=N'InspectionSummaryMbId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Inspection_Summary', @level2type=N'COLUMN',@level2name=N'ProjectId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'结果' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Inspection_Summary', @level2type=N'COLUMN',@level2name=N'SummeryResult'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'生成日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Inspection_Summary', @level2type=N'COLUMN',@level2name=N'CompileDate'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'生成年月' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Inspection_Summary', @level2type=N'COLUMN',@level2name=N'CompileDateMonth'
|
||||
GO
|
||||
|
||||
--添加菜单各项目巡查汇总
|
||||
delete From sys_menu where menuid='EA413D2A-8D29-4DE2-932D-8511BB7F6CB2'
|
||||
insert into sys_menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
values('EA413D2A-8D29-4DE2-932D-8511BB7F6CB2','各项目巡查汇总','ZHGL/InspectionSummary/InspectionSummary.aspx',140,
|
||||
'0','Menu_ZHGL','1','1','1')
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
--模板表数据
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'1', N'1.1', N'安全模块', N'人员信息', N'人员信息档案', 1)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'10', N'2.2', N'质量模块', N'WBS数据', N'WBS数据', 10)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'11', N'2.3', N'质量模块', N'综合管理', N'设备材料报验', 11)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'12', N'2.3', N'质量模块', N'综合管理', N'人员报验', 12)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'13', N'2.3', N'质量模块', N'综合管理', N'机具报验', 13)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'14', N'2.3', N'质量模块', N'综合管理', N'设计变更单管理', 14)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'15', N'2.3', N'质量模块', N'综合管理', N'施工方案管理', 15)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'16', N'2.3', N'质量模块', N'综合管理', N'设计交底管理', 16)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'17', N'2.3', N'质量模块', N'综合管理', N'NCR', 17)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'18', N'2.4', N'质量模块', N'质量报表管理', N'质量周报', 18)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'19', N'2.4', N'质量模块', N'质量报表管理', N'质量月报', 19)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'2', N'1.1', N'安全模块', N'人员信息', N'特种作业人员', 2)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'20', N'2.5', N'质量模块', N'过程控制管理', N'一次共检合格数', 20)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'21', N'2.5', N'质量模块', N'过程控制管理', N'总数', 21)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'22', N'2.5', N'质量模块', N'过程控制管理', N'一次共检合格合格率', 22)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'23', N'3', N'关键事项', N'关键事项', N'关键事项', 23)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'24', N'4.1', N'现场考勤', N'人脸考勤', N'人脸考勤', 24)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'25', N'4.2', N'现场考勤', N'集团实名制对接', N'集团实名制对接', 25)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'26', N'5', N'视频监控', N'视频监控', N'视频监控', 26)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'27', N'6', N'项目看板', N'项目看板', N'项目看板', 27)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'3', N'1.2', N'安全模块', N'安全巡检', N'安全巡检', 3)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'4', N'1.3', N'安全模块', N'会议', N'周例会', 4)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'5', N'1.3', N'安全模块', N'会议', N'月例会', 5)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'6', N'1.4', N'安全模块', N'作业票', N'作业票', 6)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'7', N'1.5', N'安全模块', N'工作报告', N'工程师日志', 7)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'8', N'1.5', N'安全模块', N'工作报告', N'HSE管理月报', 8)
|
||||
INSERT [dbo].[Inspection_SummaryMb] ([InspectionSummaryMbId], [SNumber], [ModuleName], [MenuP], [MenuC], [SortId]) VALUES (N'9', N'2.1', N'质量模块', N'质量巡检', N'质量巡检', 9)
|
||||
GO
|
||||
|
||||
|
||||
--为WBS_BreakdownProject增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON WBS_BreakdownProject (projectid)
|
||||
|
||||
--为Meeting_WeekMeeting 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Meeting_WeekMeeting (projectid)
|
||||
|
||||
--为Meeting_MonthMeeting 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Meeting_MonthMeeting (projectid)
|
||||
|
||||
--为Project_HSEDiary 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Project_HSEDiary (projectid)
|
||||
|
||||
--为Manager_ManagerWeek 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Manager_ManagerWeek (projectid)
|
||||
|
||||
--为Check_CheckControl 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Check_CheckControl (projectid)
|
||||
|
||||
--为Comprehensive_InspectionEquipment 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Comprehensive_InspectionEquipment (projectid)
|
||||
|
||||
--为Comprehensive_InspectionEquipment 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Comprehensive_InspectionPerson (projectid)
|
||||
|
||||
--为Comprehensive_InspectionMachine 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Comprehensive_InspectionMachine (projectid)
|
||||
|
||||
--为Comprehensive_DesignChangeOrder 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Comprehensive_DesignChangeOrder (projectid)
|
||||
|
||||
--为施工方案管理 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Comprehensive_GeneralPlanApproval (projectid)
|
||||
|
||||
--为Comprehensive_DesignDetails 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Comprehensive_DesignDetails (projectid)
|
||||
|
||||
--为Comprehensive_NCRManagement 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Comprehensive_NCRManagement (projectid)
|
||||
|
||||
--为Report_WeekAndMonthReport 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Report_WeekAndMonthReport (projectid)
|
||||
|
||||
--为Inspection_Summary 增加projectid索引
|
||||
CREATE INDEX index_projectid
|
||||
ON Inspection_Summary (projectid)
|
||||
|
||||
CREATE INDEX index_InspectionSummaryMbId
|
||||
ON Inspection_Summary (InspectionSummaryMbId)
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
update Inspection_SummaryMb set MenuP='WBS裁剪',MenuC='WBS裁剪' WHERE MenuP='WBS数据'
|
||||
GO
|
||||
|
|
@ -0,0 +1,108 @@
|
|||
--安全的施工方案，url改成质量的施工方案
|
||||
update sys_menu set url='CQMS/Solution/ConstructSolution.aspx'
|
||||
where url='HSSE/Solution/ConstructSolution.aspx' and menuname='施工方案' and MenuType='Menu_HSSE'
|
||||
|
||||
--创建游标将安全施工方案的数据插入质量的施工方案表
|
||||
DECLARE @ConstructSolutionId nvarchar(50),
|
||||
@ProjectId nvarchar(50),
|
||||
@ConstructSolutionName nvarchar(50),--方案名称
|
||||
@UnitId nvarchar(50),--施工单位
|
||||
@SolutinType nvarchar(50),--方案类别
|
||||
@ConstructSolutionCode nvarchar(50),--编号
|
||||
@CompileDate datetime,--审批时间
|
||||
@CompileMan nvarchar(50),--审批人
|
||||
@States nvarchar(20), --安全状态
|
||||
@State nvarchar(20)--质量状态
|
||||
|
||||
|
||||
DECLARE My_Cursor CURSOR --定义游标
|
||||
FOR ( SELECT ConstructSolutionId, ProjectId,UnitId,SolutinType,ConstructSolutionCode
|
||||
,ConstructSolutionName,CompileDate,CompileMan,States FROM Solution_ConstructSolution )
|
||||
OPEN My_Cursor;--打开游标
|
||||
FETCH NEXT FROM My_Cursor INTO @ConstructSolutionId,@ProjectId,@UnitId,@SolutinType,@ConstructSolutionCode,
|
||||
@ConstructSolutionName,
|
||||
@CompileDate,@CompileMan,@States;--读取第一行数据
|
||||
WHILE @@FETCH_STATUS=0
|
||||
--这里对游标的状态进行判断，如果为0，证明游标中有值
|
||||
BEGIN
|
||||
--状态已完成
|
||||
if(@States='2')
|
||||
begin
|
||||
set @State='3'--状态已闭合
|
||||
end
|
||||
else
|
||||
begin
|
||||
set @State='1'--未闭合
|
||||
end
|
||||
|
||||
--基础数据插入质量的施工方案主表
|
||||
INSERT INTO Solution_CQMSConstructSolution(ConstructSolutionId,ProjectId,Code
|
||||
,SolutionName,UnitId,SolutionType,CompileDate,CompileMan,State)
|
||||
values(@ConstructSolutionId,@ProjectId,@ConstructSolutionCode,
|
||||
@ConstructSolutionName,@UnitId,@SolutinType,
|
||||
@CompileDate,@CompileMan,@State);
|
||||
--插入附件表
|
||||
insert into AttachFile(AttachFileId,ToKeyId,AttachSource,AttachUrl,menuid,AttachPath,ImageByte)
|
||||
select newid(),ToKeyId,AttachSource,AttachUrl,'91C4BFDB-0A51-4992-99CC-EB4EC185593D',AttachPath,ImageByte from AttachFile
|
||||
where ToKeyId=@ConstructSolutionId
|
||||
|
||||
|
||||
FETCH NEXT
|
||||
FROM
|
||||
My_Cursor INTO @ConstructSolutionId,@ProjectId,@UnitId,@SolutinType,@ConstructSolutionCode,
|
||||
@ConstructSolutionName,
|
||||
@CompileDate,@CompileMan,@States;
|
||||
|
||||
END CLOSE My_Cursor;--关闭游标
|
||||
DEALLOCATE My_Cursor;--释放游标
|
||||
GO
|
||||
|
||||
--insert into Technique_CheckItemSet(CheckItemSetId,CheckItemName,SupCheckItem,CheckType,MapCode,IsEndLever,SortIndex)
|
||||
--values('43594e1e-66e2-4664-bad7-feb12ea4844a','综合类','0','2','10','0','4')
|
||||
--删除专项检查类别 -综合类型 -新型肺炎防控
|
||||
delete from Check_CheckSpecial where CheckItemSetId='43594e1e-66e2-4664-bad7-feb12ea4844a'
|
||||
delete from Technique_CheckItemSet where CheckItemSetId='43594e1e-66e2-4664-bad7-feb12ea4844a'
|
||||
go
|
||||
delete from Check_CheckSpecial where CheckItemSetId='4324d0f5-cf7b-4e89-be56-45ba131f5f2f'
|
||||
delete from Technique_CheckItemSet where CheckItemSetId='4324d0f5-cf7b-4e89-be56-45ba131f5f2f'
|
||||
go
|
||||
|
||||
--增加专项检查明细项字段-检查项内容、整改期限
|
||||
alter table Check_CheckSpecialDetail add CheckItemSetId nvarchar(50) null;
|
||||
alter table Check_CheckSpecialDetail add CheckItemSetContent nvarchar(3000) null;
|
||||
alter table Check_CheckSpecialDetail add Rectification_Date datetime null;
|
||||
go
|
||||
|
||||
--为视图增加列
|
||||
/*LEFT JOIN Sys_Const AS const ON const.ConstValue = detail.HandleStep and const.GroupId='HandleStep'*/
|
||||
ALTER VIEW [dbo].[View_CheckSpecialDetail]
|
||||
AS
|
||||
SELECT detail.CheckSpecialDetailId, detail.CheckSpecialId, detail.CheckItem, checkItemSet.CheckItemName, detail.Unqualified,
|
||||
detail.SortIndex, detail.UnitId, detail.HandleStep, detail.CompleteStatus,
|
||||
(CASE WHEN detail.CompleteStatus = 1 THEN '已整改' ELSE '待整改' END) AS CompleteStatusName, detail.LimitedDate,
|
||||
detail.CompletedDate, detail.CheckContent, detail.CheckArea,
|
||||
workArea.UnitWorkName + (CASE WHEN workArea.ProjectType = '1' THEN '(建筑)' WHEN workArea.ProjectType = '2' THEN '(安装)'
|
||||
ELSE '' END) AS CheckAreaName, detail.DataId, detail.DataType, unit.UnitName,
|
||||
dbo.GetConstTextByIds(detail.HandleStep) AS HandleStepStr,
|
||||
(CASE WHEN detail.DataType LIKE '%1%' THEN '下发整改单:' +
|
||||
(SELECT RectifyNoticesCode
|
||||
FROM Check_RectifyNotices
|
||||
WHERE detail.DataId LIKE '%' + RectifyNoticesId + '%') ELSE '' END)
|
||||
+ (CASE WHEN detail.DataType LIKE '%2%' THEN '下发处罚单:' +
|
||||
(SELECT PunishNoticeCode
|
||||
FROM Check_PunishNotice
|
||||
WHERE detail.DataId LIKE '%' + PunishNoticeId + '%') ELSE '' END)
|
||||
+ (CASE WHEN detail.DataType = '3' THEN '下发暂停令:' +
|
||||
(SELECT PauseNoticeCode
|
||||
FROM Check_PauseNotice
|
||||
WHERE detail.DataId LIKE '%' + PauseNoticeId + '%') ELSE '' END) AS HandleStepLink, detail.HiddenHazardType,
|
||||
(CASE WHEN detail.HiddenHazardType = '3' THEN '重大' WHEN detail.HiddenHazardType = '2' THEN '较大' WHEN detail.HiddenHazardType
|
||||
= '1' THEN '一般' ELSE '' END) AS HiddenHazardTypeName, detail.CheckItemSetId, detail.CheckItemSetContent,
|
||||
detail.Rectification_Date
|
||||
FROM dbo.Check_CheckSpecialDetail AS detail LEFT OUTER JOIN
|
||||
dbo.Technique_CheckItemSet AS checkItemSet ON checkItemSet.CheckItemSetId = detail.CheckItem LEFT OUTER JOIN
|
||||
dbo.Base_Unit AS unit ON unit.UnitId = detail.UnitId LEFT OUTER JOIN
|
||||
dbo.WBS_UnitWork AS workArea ON detail.CheckArea = workArea.UnitWorkId
|
||||
|
||||
GO
|
||||
|
||||
|
|
@ -0,0 +1,393 @@
|
|||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','动火作业票','HSSE/License/FireWork.aspx',10,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('8DB0EAED-B67D-423A-BA13-E7872A11727A','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('F0283058-2CCF-4195-AEBC-878A2AE5067F','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('2C3CD3AA-C07D-439F-97BE-FEA20CE512CB','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('BBB22814-70D3-4188-A7F8-8C0FD4557A27','2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B','保存',4)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','高处作业票','HSSE/License/HeightWork.aspx',20,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('B3CD11DC-D359-4D60-8DB4-BD095CE52C17','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('6D9B6919-0677-4892-9C73-CDD6C124B855','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('044C6FF2-2A30-4E08-88A6-9D85722AD89C','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('7C06CD77-402A-4F8C-A41B-1C69301707E5','DA1CAE8E-B5BF-4AC0-9996-AF6CAA412CA9','保存',4)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','受限空间作业票','HSSE/License/LimitedSpace.aspx',30,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('904FD3D2-1520-48FB-BD8F-6BAA000653B7','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('7F372BE4-E264-48FB-ACA6-8E7EE41393EC','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('BE6D9AE8-069A-421A-8E3D-F3DDC18FCDB4','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('8CC252A0-F098-4FE3-AF21-4A7A7030DC5E','AEC9166D-1C91-45F0-8BFE-D3D0479A28C7','保存',4)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('F72FF20B-D3EB-46A5-97F7-C99B2473A140','射线作业票','HSSE/License/RadialWork.aspx',40,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('107EA8EA-4D8D-410B-B3DE-F0C29E9C3EDC','F72FF20B-D3EB-46A5-97F7-C99B2473A140','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('89010EF9-9E77-49EB-A00D-3142B9FBC29E','F72FF20B-D3EB-46A5-97F7-C99B2473A140','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('F5EFEB84-7CCC-406D-ACFA-CA36CB6A8A1D','F72FF20B-D3EB-46A5-97F7-C99B2473A140','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('982333DA-42A2-40A3-8F3D-52BA7DE4E19D','F72FF20B-D3EB-46A5-97F7-C99B2473A140','保存',4)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('4E607E83-41FC-4F49-B26F-A21CFE38328F','断路(占道)作业票','HSSE/License/OpenCircuit.aspx',60,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('6D90E4CD-D932-454A-8A8B-54FA3CC22FD4','4E607E83-41FC-4F49-B26F-A21CFE38328F','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('53BF21A8-38DA-4853-A527-8D392B901554','4E607E83-41FC-4F49-B26F-A21CFE38328F','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('06F8CEAB-7AF8-40C5-B6D0-6A91AE562AD7','4E607E83-41FC-4F49-B26F-A21CFE38328F','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('C8BE46DF-2553-4A64-BE79-B69712C297A5','4E607E83-41FC-4F49-B26F-A21CFE38328F','保存',4)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('755C6AC9-2E38-4D4F-AF33-33CB1744A907','动土作业票','HSSE/License/BreakGround.aspx',70,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('F3D52EF3-104F-42CF-B48A-443FCE5C800D','755C6AC9-2E38-4D4F-AF33-33CB1744A907','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('7DFD6886-0F8B-4DA1-9C4B-1847A8B286AF','755C6AC9-2E38-4D4F-AF33-33CB1744A907','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('F5F93A18-438F-4A19-982B-7E9E38EB6AE2','755C6AC9-2E38-4D4F-AF33-33CB1744A907','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('32937824-9F35-4C4E-8E13-984E784F8E9C','755C6AC9-2E38-4D4F-AF33-33CB1744A907','保存',4)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('7BBAE649-7B00-4475-A911-BFE3A37AC55B','夜间施工作业票','HSSE/License/NightWork.aspx',80,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('B040C80B-4216-4AF8-B9C9-A1303E31CFAC','7BBAE649-7B00-4475-A911-BFE3A37AC55B','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('60241503-BF4B-4159-AFA2-41186CD9329B','7BBAE649-7B00-4475-A911-BFE3A37AC55B','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('3A192DC6-2338-4038-ADAD-46FA7364E20F','7BBAE649-7B00-4475-A911-BFE3A37AC55B','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('6239BB95-33AF-4B36-97CB-787EF553D35A','7BBAE649-7B00-4475-A911-BFE3A37AC55B','保存',4)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('A1BE3AB6-9D4A-41E7-8870-E73423165451','吊装作业票','HSSE/License/LiftingWork.aspx',80,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('BDC9E201-0C51-4C02-9151-B6DF86CE4C27','A1BE3AB6-9D4A-41E7-8870-E73423165451','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('36EBA247-3051-4213-BD95-89DC948006E1','A1BE3AB6-9D4A-41E7-8870-E73423165451','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('46A93981-2D60-49C3-877A-7B66EBCBC927','A1BE3AB6-9D4A-41E7-8870-E73423165451','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('3C5F18F7-459A-4666-B497-9400E637C975','A1BE3AB6-9D4A-41E7-8870-E73423165451','保存',4)
|
||||
GO
|
||||
|
||||
update sys_menu set menuname='HSSE事故处理' where menuname ='HSSE事故(含未遂)处理'
|
||||
|
||||
--增加动火作业表字段
|
||||
--单项工程
|
||||
ALTER TABLE License_FireWork
|
||||
ADD WorkAreaId nvarchar(500) null;
|
||||
--动火原因
|
||||
ALTER TABLE License_FireWork
|
||||
ADD Reason nvarchar(500) null;
|
||||
--动火作业级别
|
||||
ALTER TABLE License_FireWork
|
||||
ADD FireLevel nvarchar(20) null;
|
||||
|
||||
|
||||
--受限空间
|
||||
--单项工程
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD WorkAreaId nvarchar(500) null;
|
||||
--空间内介质描述
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD LimitedDescribe nvarchar(500) null;
|
||||
--是否存在其它介质
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD IsBoolOther bit null;
|
||||
--作业是否耗氧或产生其它有毒有害气体
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD IsBoolHarmfulGas bit null;
|
||||
--氧含量测试结果
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD TestResult nvarchar(500) null;
|
||||
--测试时间
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD TestDate datetime null;
|
||||
--测试人
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD TestPerson nvarchar(100) null;
|
||||
--通风措施
|
||||
ALTER TABLE License_LimitedSpace
|
||||
ADD VenStep nvarchar(20) null;
|
||||
|
||||
|
||||
--动土作业票
|
||||
--单项工程
|
||||
ALTER TABLE License_BreakGround
|
||||
ADD WorkAreaId nvarchar(500) null;
|
||||
--原因
|
||||
ALTER TABLE License_BreakGround
|
||||
ADD Reason nvarchar(500) null;
|
||||
--监护人姓名
|
||||
ALTER TABLE License_BreakGround
|
||||
ADD FireWatchManName nvarchar(500) null;
|
||||
|
||||
|
||||
--高处作业票
|
||||
--单项工程
|
||||
ALTER TABLE License_HeightWork
|
||||
ADD WorkAreaId nvarchar(500) null;
|
||||
--作业点高度
|
||||
ALTER TABLE License_HeightWork
|
||||
ADD WorkHeight nvarchar(20) null;
|
||||
--高处作业级别
|
||||
ALTER TABLE License_HeightWork
|
||||
ADD HeightLevel nvarchar(20) null;
|
||||
--监护人姓名
|
||||
ALTER TABLE License_HeightWork
|
||||
ADD FireWatchManName nvarchar(500) null;
|
||||
|
||||
--负责人姓名
|
||||
ALTER TABLE License_HeightWork
|
||||
ADD WorkLeaderName nvarchar(200) null;
|
||||
--负责人电话
|
||||
ALTER TABLE License_HeightWork
|
||||
ADD WorkLeaderTel nvarchar(200) null;
|
||||
|
||||
--吊装
|
||||
--单项工程
|
||||
ALTER TABLE License_LiftingWork
|
||||
ADD WorkAreaId nvarchar(500) null;
|
||||
--吊装高度
|
||||
ALTER TABLE License_LiftingWork
|
||||
ADD LiftingHeight nvarchar(20) null;
|
||||
|
||||
--监护人姓名
|
||||
ALTER TABLE License_LiftingWork
|
||||
ADD FireWatchManName nvarchar(500) null;
|
||||
|
||||
--负责人姓名
|
||||
ALTER TABLE License_LiftingWork
|
||||
ADD WorkLeaderName nvarchar(200) null;
|
||||
--负责人电话
|
||||
ALTER TABLE License_LiftingWork
|
||||
ADD WorkLeaderTel nvarchar(200) null;
|
||||
|
||||
--起重工姓名
|
||||
ALTER TABLE License_LiftingWork
|
||||
ADD QzgName nvarchar(200) null;
|
||||
--起重工电话
|
||||
ALTER TABLE License_LiftingWork
|
||||
ADD QzgPhone nvarchar(200) null;
|
||||
|
||||
--断路作业
|
||||
--单项工程
|
||||
ALTER TABLE License_OpenCircuit
|
||||
ADD WorkAreaId nvarchar(500) null;
|
||||
--断路作业原因
|
||||
ALTER TABLE License_OpenCircuit
|
||||
ADD Reason nvarchar(500) null;
|
||||
--监护人姓名
|
||||
ALTER TABLE License_OpenCircuit
|
||||
ADD FireWatchManName nvarchar(500) null;
|
||||
|
||||
|
||||
--射线作业
|
||||
--单项工程
|
||||
ALTER TABLE License_RadialWork
|
||||
ADD WorkAreaId nvarchar(500) null;
|
||||
|
||||
--增加临时用电菜单
|
||||
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','临时用电作业票','HSSE/License/Electricity.aspx',50,'473A87D2-1365-4A68-BD38-06F312F81BC2','Menu_HSSE',0,1,1)
|
||||
GO
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('4D6FE464-B5D7-48BE-B68D-C55C9E8E6202','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','增加',1)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('0086D338-3864-4C90-BEDB-7E752622837D','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','修改',2)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('184C6276-C8B6-421B-B0F9-A74CDCBA53E9','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','删除',3)
|
||||
INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
|
||||
VALUES('065EC96A-1AF4-457F-AA13-CEEAB5A0BD7C','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','保存',4)
|
||||
GO
|
||||
CREATE TABLE [dbo].[License_Electricity](
|
||||
[ElectricityId] [nvarchar](50) NOT NULL,
|
||||
[ProjectId] [nvarchar](50) NULL,
|
||||
[LicenseCode] [nvarchar](50) NULL,
|
||||
[ApplyUnitId] [nvarchar](50) NULL,
|
||||
[ApplyManId] [nvarchar](50) NULL,
|
||||
[ApplyDate] [datetime] NULL,
|
||||
[WorkPalce] [nvarchar](300) NULL,
|
||||
[WorkDepth] [nvarchar](50) NULL,
|
||||
[ValidityStartTime] [datetime] NULL,
|
||||
[ValidityEndTime] [datetime] NULL,
|
||||
[WorkMeasures] [nvarchar](500) NULL,
|
||||
[CancelManId] [nvarchar](50) NULL,
|
||||
[CancelReasons] [nvarchar](200) NULL,
|
||||
[CancelTime] [datetime] NULL,
|
||||
[CloseManId] [nvarchar](50) NULL,
|
||||
[CloseReasons] [nvarchar](200) NULL,
|
||||
[CloseTime] [datetime] NULL,
|
||||
[States] [varchar](2) NULL,
|
||||
[NextManId] [nvarchar](500) NULL,
|
||||
[OldLicenseId] [nvarchar](50) NULL,
|
||||
[WorkAreaId] [nvarchar](500) NULL,
|
||||
[Reason] [nvarchar](500) NULL,
|
||||
[FireWatchManName] [nvarchar](500) NULL,
|
||||
CONSTRAINT [PK_License_Electricity] PRIMARY KEY CLUSTERED
|
||||
(
|
||||
[ElectricityId] ASC
|
||||
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
|
||||
) ON [PRIMARY]
|
||||
|
||||
GO
|
||||
|
||||
SET ANSI_PADDING OFF
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Base_Project] FOREIGN KEY([ProjectId])
|
||||
REFERENCES [dbo].[Base_Project] ([ProjectId])
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Base_Project]
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Base_Unit] FOREIGN KEY([ApplyUnitId])
|
||||
REFERENCES [dbo].[Base_Unit] ([UnitId])
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Base_Unit]
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Sys_User] FOREIGN KEY([ApplyManId])
|
||||
REFERENCES [dbo].[Sys_User] ([UserId])
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Sys_User]
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Sys_User2] FOREIGN KEY([CancelManId])
|
||||
REFERENCES [dbo].[Sys_User] ([UserId])
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Sys_User2]
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] WITH CHECK ADD CONSTRAINT [FK_License_Electricity_Sys_User3] FOREIGN KEY([CloseManId])
|
||||
REFERENCES [dbo].[Sys_User] ([UserId])
|
||||
GO
|
||||
|
||||
ALTER TABLE [dbo].[License_Electricity] CHECK CONSTRAINT [FK_License_Electricity_Sys_User3]
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'主键ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ElectricityId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ProjectId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'编号' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'LicenseCode'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'申请单ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ApplyUnitId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'申请人ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ApplyManId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'申请时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ApplyDate'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'作业地点' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'WorkPalce'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'开挖深度' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'WorkDepth'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'有效期开始时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ValidityStartTime'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'有效期结束时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'ValidityEndTime'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'作业内容、机具及安全措施' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'WorkMeasures'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'取消人ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CancelManId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'取消原因' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CancelReasons'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'取消时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CancelTime'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'关闭人ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CloseManId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'关闭原因' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CloseReasons'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'关闭时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'CloseTime'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'状态(0-待提交；1-审核中；2-审核完成；3-关闭；-1取消)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'States'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'下步办理人ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'NextManId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'原许可证ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity', @level2type=N'COLUMN',@level2name=N'OldLicenseId'
|
||||
GO
|
||||
|
||||
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'动土作业票表' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'License_Electricity'
|
||||
GO
|
||||
|
||||
--临时用电安装人姓名
|
||||
ALTER TABLE License_Electricity
|
||||
ADD WorkLeaderName nvarchar(200) null;
|
||||
--临时用电安装人电话
|
||||
ALTER TABLE License_Electricity
|
||||
ADD WorkLeaderTel nvarchar(200) null;
|
||||
|
||||
--临时作业票审批流程
|
||||
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF51','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',1,1,1,'施工单位安全人员意见',0)
|
||||
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF52','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',2,1,1,'总包单位安全人员意见',0)
|
||||
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF53','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,1,1,'总包单位专业工程师意见',0)
|
||||
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF54','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,1,2,'总包单位施工经理意见',0)
|
||||
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF55','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,2,1,'监理单位意见',0)
|
||||
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF56','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',3,2,2,'业主单位意见',0)
|
||||
INSERT Sys_MenuFlowOperate(FlowOperateId,MenuId,FlowStep,GroupNum,OrderNum,AuditFlowName,IsFlowEnd)
|
||||
VALUES('48F64E0F-38B2-4BDC-9B61-6200BD02CBF57','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5',4,1,1,'完成',1)
|
||||
|
||||
--添加作业类型
|
||||
insert into Sys_Const(id,ConstValue,ConstText,SortIndex,GroupId)
|
||||
values('8A1DF18E-4CE6-4AA1-AD2C-625823BC4D8E','48F64E0F-38B2-4BDC-9B61-6200BD02CBF5','临时用电作业票',9,'LicenseType')
|
||||
|
||||
--修所有作业审批流（一人审批）
|
||||
delete from Sys_MenuFlowOperate where flowStep!=1
|
||||
update Sys_MenuFlowOperate set auditflowname='审批人意见'
|
||||
|
||||
|
||||
|
||||
|
|
@ -234,6 +234,10 @@ namespace BLL
|
|||
CompleteStatusName = x.CompleteStatus == true ? "已整改" : "待整改",
|
||||
CompletedDate = string.Format("{0:yyyy-MM-dd}", x.CompletedDate),
|
||||
AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialDetailId, null),
|
||||
|
||||
CheckItemDetailSetId = x.CheckItemSetId,
|
||||
CheckItemDetailContent = x.CheckItemSetContent,
|
||||
Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
|
||||
};
|
||||
return getInfo.ToList();
|
||||
}
|
||||
|
|
@ -282,6 +286,10 @@ namespace BLL
|
|||
CompleteStatus = x.CompleteStatus,
|
||||
CompleteStatusName = x.CompleteStatus == true ? "已整改" : "待整改",
|
||||
AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialDetailId, null),
|
||||
|
||||
CheckItemDetailSetId=x.CheckItemSetId,
|
||||
CheckItemDetailContent=x.CheckItemSetContent,
|
||||
Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
|
||||
};
|
||||
return getInfo.First();
|
||||
}
|
||||
|
|
@ -316,6 +324,11 @@ namespace BLL
|
|||
WorkArea = newDetail.WorkArea,
|
||||
CheckArea = newDetail.WorkAreaId,
|
||||
CheckContent = newDetail.CheckContent,
|
||||
|
||||
//整改日期、检查内容、检查内容id
|
||||
CheckItemSetId= newDetail.CheckItemDetailSetId,
|
||||
CheckItemSetContent= newDetail.CheckItemDetailContent,
|
||||
Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date)
|
||||
};
|
||||
if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
|
||||
{
|
||||
|
|
@ -357,6 +370,11 @@ namespace BLL
|
|||
updateDetail.WorkArea = newCheckSpecialDetail.WorkArea;
|
||||
updateDetail.CheckArea = newCheckSpecialDetail.CheckArea;
|
||||
updateDetail.CheckContent = newCheckSpecialDetail.CheckContent;
|
||||
|
||||
//整改日期、检查内容、检查内容id
|
||||
updateDetail.CheckItemSetId = newDetail.CheckItemDetailSetId;
|
||||
updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
|
||||
updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
////保存附件
|
||||
|
|
|
|||
|
|
@ -58,6 +58,11 @@ namespace BLL
|
|||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.FireWorkId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireLevel = x.FireLevel
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -96,6 +101,14 @@ namespace BLL
|
|||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.HeightWorkId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
WorkHeight = x.WorkHeight,
|
||||
HeightLevel = x.HeightLevel,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
WorkLeaderName = x.WorkLeaderName,
|
||||
WorkLeaderTel = x.WorkLeaderTel,
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -134,6 +147,16 @@ namespace BLL
|
|||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.LimitedSpaceId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
LimitedDescribe = x.LimitedDescribe,
|
||||
IsBoolOther = x.IsBoolOther,
|
||||
IsBoolHarmfulGas = x.IsBoolHarmfulGas,
|
||||
TestResult = x.TestResult,
|
||||
TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
|
||||
TestPerson = x.TestPerson,
|
||||
VenStep = x.VenStep,
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -177,6 +200,9 @@ namespace BLL
|
|||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.RadialWorkId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -215,6 +241,11 @@ namespace BLL
|
|||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.OpenCircuitId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -252,6 +283,11 @@ namespace BLL
|
|||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.BreakGroundId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -332,6 +368,60 @@ namespace BLL
|
|||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.LiftingWorkId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
LiftingHeight = x.LiftingHeight,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
WorkLeaderName = x.WorkLeaderName,
|
||||
WorkLeaderTel = x.WorkLeaderTel,
|
||||
QzgName = x.QzgName,
|
||||
QzgPhone = x.QzgPhone,
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 临时用电作业票
|
||||
if (strMenuId == Const.ProjectElectricityMenuId)
|
||||
{
|
||||
getInfo = (from x in db.License_Electricity
|
||||
where x.ElectricityId == id
|
||||
select new Model.LicenseDataItem
|
||||
{
|
||||
LicenseId = x.ElectricityId,
|
||||
MenuId = strMenuId,
|
||||
ProjectId = x.ProjectId,
|
||||
LicenseCode = x.LicenseCode,
|
||||
ApplyUnitId = x.ApplyUnitId,
|
||||
ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName,
|
||||
ApplyManId = x.ApplyManId,
|
||||
ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName,
|
||||
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
|
||||
WorkPalce = x.WorkPalce,
|
||||
WorkDepth = x.WorkDepth,
|
||||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
WorkMeasures = x.WorkMeasures,
|
||||
CancelManId = x.CancelManId,
|
||||
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
|
||||
CancelReasons = x.CancelReasons,
|
||||
CancelTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CancelTime),
|
||||
CloseManId = x.CloseManId,
|
||||
CloseManName = db.Sys_User.First(u => u.UserId == x.CloseManId).UserName,
|
||||
CloseReasons = x.CloseReasons,
|
||||
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
|
||||
NextManId = x.NextManId,
|
||||
NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName,
|
||||
AttachUrl = db.AttachFile.First(z => z.ToKeyId == x.ElectricityId).AttachUrl.Replace('\\', '/'),
|
||||
States = x.States,
|
||||
OldLicenseId = x.OldLicenseId,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
WorkLeaderName=x.WorkLeaderName,
|
||||
WorkLeaderTel=x.WorkLeaderTel
|
||||
}).FirstOrDefault();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -419,6 +509,11 @@ namespace BLL
|
|||
CloseReasons = x.CloseReasons,
|
||||
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason=x.Reason,
|
||||
FireLevel=x.FireLevel
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -455,6 +550,15 @@ namespace BLL
|
|||
CloseReasons = x.CloseReasons,
|
||||
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
WorkHeight=x.WorkHeight,
|
||||
HeightLevel=x.HeightLevel,
|
||||
FireWatchManName=x.FireWatchManName,
|
||||
WorkLeaderName=x.WorkLeaderName,
|
||||
WorkLeaderTel=x.WorkLeaderTel,
|
||||
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -491,6 +595,20 @@ namespace BLL
|
|||
CloseReasons = x.CloseReasons,
|
||||
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
LimitedDescribe=x.LimitedDescribe,
|
||||
IsBoolOther=x.IsBoolOther,
|
||||
IsBoolHarmfulGas=x.IsBoolHarmfulGas,
|
||||
TestResult=x.TestResult,
|
||||
TestDate= string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
|
||||
TestPerson=x.TestPerson,
|
||||
VenStep=x.VenStep,
|
||||
|
||||
|
||||
|
||||
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -534,6 +652,10 @@ namespace BLL
|
|||
NextManId = x.NextManId,
|
||||
NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName,
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -570,6 +692,12 @@ namespace BLL
|
|||
CloseReasons = x.CloseReasons,
|
||||
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason=x.Reason,
|
||||
FireWatchManName=x.FireWatchManName,
|
||||
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -605,6 +733,12 @@ namespace BLL
|
|||
CloseReasons = x.CloseReasons,
|
||||
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason=x.Reason,
|
||||
FireWatchManName=x.FireWatchManName,
|
||||
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -685,6 +819,60 @@ namespace BLL
|
|||
NextManId = x.NextManId,
|
||||
NextManName = db.Sys_User.First(u => u.UserId == x.NextManId).UserName,
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
LiftingHeight=x.LiftingHeight,
|
||||
FireWatchManName=x.FireWatchManName,
|
||||
WorkLeaderName=x.WorkLeaderName,
|
||||
WorkLeaderTel=x.WorkLeaderTel,
|
||||
QzgName=x.QzgName,
|
||||
QzgPhone=x.QzgPhone,
|
||||
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 临时用电作业票
|
||||
if (strMenuId == Const.ProjectElectricityMenuId)
|
||||
{
|
||||
getInfoList = (from x in db.License_Electricity
|
||||
where x.ProjectId == projectId && (x.ApplyUnitId == unitId || unitId == null)
|
||||
&& (states == null || x.States == states)
|
||||
orderby x.LicenseCode descending
|
||||
select new Model.LicenseDataItem
|
||||
{
|
||||
LicenseId = x.ElectricityId,
|
||||
MenuId = strMenuId,
|
||||
ProjectId = x.ProjectId,
|
||||
LicenseCode = x.LicenseCode,
|
||||
ApplyUnitId = x.ApplyUnitId,
|
||||
ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName,
|
||||
ApplyManId = x.ApplyManId,
|
||||
ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName,
|
||||
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
|
||||
WorkPalce = x.WorkPalce,
|
||||
WorkDepth = x.WorkDepth,
|
||||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
WorkMeasures = x.WorkMeasures,
|
||||
CancelManId = x.CancelManId,
|
||||
CancelManName = db.Sys_User.First(u => u.UserId == x.CancelManId).UserName,
|
||||
CancelReasons = x.CancelReasons,
|
||||
CancelTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CancelTime),
|
||||
CloseManId = x.CloseManId,
|
||||
CloseManName = db.Sys_User.First(u => u.UserId == x.CloseManId).UserName,
|
||||
CloseReasons = x.CloseReasons,
|
||||
CloseTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.CloseTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
WorkLeaderName=x.WorkLeaderName,
|
||||
WorkLeaderTel=x.WorkLeaderTel,
|
||||
|
||||
}).ToList();
|
||||
}
|
||||
#endregion
|
||||
|
|
@ -760,6 +948,11 @@ namespace BLL
|
|||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireLevel = x.FireLevel
|
||||
}).ToList();
|
||||
if (getFireWork.Count() > 0)
|
||||
{
|
||||
|
|
@ -788,6 +981,14 @@ namespace BLL
|
|||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
WorkHeight = x.WorkHeight,
|
||||
HeightLevel = x.HeightLevel,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
WorkLeaderName = x.WorkLeaderName,
|
||||
WorkLeaderTel = x.WorkLeaderTel,
|
||||
}).ToList();
|
||||
if (getHeightWork.Count() > 0)
|
||||
{
|
||||
|
|
@ -815,6 +1016,17 @@ namespace BLL
|
|||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
LimitedDescribe = x.LimitedDescribe,
|
||||
IsBoolOther = x.IsBoolOther,
|
||||
IsBoolHarmfulGas = x.IsBoolHarmfulGas,
|
||||
TestResult = x.TestResult,
|
||||
TestDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.TestDate),
|
||||
TestPerson = x.TestPerson,
|
||||
VenStep = x.VenStep,
|
||||
|
||||
}).ToList();
|
||||
if (getLimitedSpace.Count() > 0)
|
||||
{
|
||||
|
|
@ -843,6 +1055,9 @@ namespace BLL
|
|||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
WorkPalce = x.WorkPalce,
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
}).ToList();
|
||||
if (getRadialWork.Count() > 0)
|
||||
{
|
||||
|
|
@ -871,6 +1086,11 @@ namespace BLL
|
|||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
RoadName = x.RoadName,
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
}).ToList();
|
||||
if (getOpenCircuit.Count() > 0)
|
||||
{
|
||||
|
|
@ -899,6 +1119,11 @@ namespace BLL
|
|||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
}).ToList();
|
||||
if (getBreakGround.Count() > 0)
|
||||
{
|
||||
|
|
@ -954,6 +1179,15 @@ namespace BLL
|
|||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
LiftingHeight = x.LiftingHeight,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
WorkLeaderName = x.WorkLeaderName,
|
||||
WorkLeaderTel = x.WorkLeaderTel,
|
||||
QzgName = x.QzgName,
|
||||
QzgPhone = x.QzgPhone,
|
||||
}).ToList();
|
||||
if (getLiftingWork.Count() > 0)
|
||||
{
|
||||
|
|
@ -961,6 +1195,41 @@ namespace BLL
|
|||
}
|
||||
#endregion
|
||||
|
||||
#region 临时用电作业票
|
||||
var getElectricity = (from x in db.License_Electricity
|
||||
where x.ProjectId == projectId && (x.ApplyUnitId == unitId || unitId == null)
|
||||
&& (states == null || x.States == states)
|
||||
select new Model.LicenseDataItem
|
||||
{
|
||||
LicenseId = x.ElectricityId,
|
||||
MenuId = Const.ProjectElectricityMenuId,
|
||||
MenuName = "临时用电",
|
||||
ProjectId = x.ProjectId,
|
||||
LicenseCode = x.LicenseCode,
|
||||
ApplyUnitId = x.ApplyUnitId,
|
||||
ApplyUnitName = db.Base_Unit.First(u => u.UnitId == x.ApplyUnitId).UnitName,
|
||||
ApplyManId = x.ApplyManId,
|
||||
ApplyManName = db.Sys_User.First(u => u.UserId == x.ApplyManId).UserName,
|
||||
ApplyDate = string.Format("{0:yyyy-MM-dd HH:mm}", x.ApplyDate),
|
||||
WorkPalce = x.WorkPalce,
|
||||
WorkDepth = x.WorkDepth,
|
||||
ValidityStartTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityStartTime),
|
||||
ValidityEndTime = string.Format("{0:yyyy-MM-dd HH:mm}", x.ValidityEndTime),
|
||||
States = x.States,
|
||||
|
||||
WorkAreaId = x.WorkAreaId,
|
||||
WorkAreaName = UnitWorkService.GetUnitWorkName(x.WorkAreaId),
|
||||
Reason = x.Reason,
|
||||
FireWatchManName = x.FireWatchManName,
|
||||
WorkLeaderName=x.WorkLeaderName,
|
||||
WorkLeaderTel=x.WorkLeaderTel,
|
||||
}).ToList();
|
||||
if (getElectricity.Count() > 0)
|
||||
{
|
||||
getInfoList.AddRange(getElectricity);
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 作业票【定稿 】"待开工"="1";"作业中"="2";"已关闭"="3";"已取消"="-1"
|
||||
var getLicenseManager = (from x in db.License_LicenseManager
|
||||
where x.ProjectId == projectId && (x.UnitId == unitId || unitId == null)
|
||||
|
|
@ -1106,6 +1375,10 @@ namespace BLL
|
|||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
WorkAreaId=newItem.WorkAreaId,
|
||||
Reason=newItem.Reason,
|
||||
FireLevel=newItem.FireLevel
|
||||
};
|
||||
|
||||
if (newItem.States == Const.State_0)
|
||||
|
|
@ -1156,6 +1429,10 @@ namespace BLL
|
|||
updateFireWork.WorkMeasures = newFireWork.WorkMeasures;
|
||||
updateFireWork.NextManId = newFireWork.NextManId;
|
||||
updateFireWork.States = newFireWork.States;
|
||||
|
||||
updateFireWork.WorkAreaId = newItem.WorkAreaId;
|
||||
updateFireWork.Reason = newItem.Reason;
|
||||
updateFireWork.FireLevel = newItem.FireLevel;
|
||||
}
|
||||
updateFireWork.States = newFireWork.States;
|
||||
}
|
||||
|
|
@ -1186,6 +1463,15 @@ namespace BLL
|
|||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
WorkAreaId=newItem.WorkAreaId,
|
||||
WorkHeight=newItem.WorkHeight,
|
||||
HeightLevel=newItem.HeightLevel,
|
||||
FireWatchManName=newItem.FireWatchManName,
|
||||
WorkLeaderName=newItem.WorkLeaderName,
|
||||
WorkLeaderTel=newItem.WorkLeaderTel,
|
||||
|
||||
|
||||
};
|
||||
if (newItem.States == Const.State_0)
|
||||
{
|
||||
|
|
@ -1236,6 +1522,12 @@ namespace BLL
|
|||
updateHeightWork.EquipmentTools = newHeightWork.EquipmentTools;
|
||||
updateHeightWork.NextManId = newHeightWork.NextManId;
|
||||
updateHeightWork.States = newHeightWork.States;
|
||||
updateHeightWork.WorkAreaId = newItem.WorkAreaId;
|
||||
updateHeightWork.WorkHeight = newItem.WorkHeight;
|
||||
updateHeightWork.HeightLevel = newItem.HeightLevel;
|
||||
updateHeightWork.FireWatchManName = newItem.FireWatchManName;
|
||||
updateHeightWork.WorkLeaderName = newItem.WorkLeaderName;
|
||||
updateHeightWork.WorkLeaderTel = newItem.WorkLeaderTel;
|
||||
}
|
||||
updateHeightWork.States = newHeightWork.States;
|
||||
}
|
||||
|
|
@ -1266,6 +1558,14 @@ namespace BLL
|
|||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
LimitedDescribe=newItem.LimitedDescribe,
|
||||
IsBoolOther=newItem.IsBoolOther,
|
||||
IsBoolHarmfulGas=newItem.IsBoolHarmfulGas,
|
||||
TestResult=newItem.TestResult,
|
||||
TestDate= Funs.GetNewDateTime(newItem.TestDate),
|
||||
TestPerson=newItem.TestPerson,
|
||||
VenStep=newItem.VenStep
|
||||
};
|
||||
if (newItem.States == Const.State_0)
|
||||
{
|
||||
|
|
@ -1315,6 +1615,14 @@ namespace BLL
|
|||
updateLimitedSpace.WorkMeasures = newLimitedSpace.WorkMeasures;
|
||||
updateLimitedSpace.NextManId = newLimitedSpace.NextManId;
|
||||
updateLimitedSpace.States = newLimitedSpace.States;
|
||||
|
||||
updateLimitedSpace.LimitedDescribe = newItem.LimitedDescribe;
|
||||
updateLimitedSpace.IsBoolOther = newItem.IsBoolOther;
|
||||
updateLimitedSpace.IsBoolHarmfulGas = newItem.IsBoolHarmfulGas;
|
||||
updateLimitedSpace.TestResult = newItem.TestResult;
|
||||
updateLimitedSpace.TestDate = Funs.GetNewDateTime(newItem.TestDate);
|
||||
updateLimitedSpace.TestPerson = newItem.TestPerson;
|
||||
updateLimitedSpace.VenStep = newItem.VenStep;
|
||||
}
|
||||
updateLimitedSpace.States = newLimitedSpace.States;
|
||||
}
|
||||
|
|
@ -1348,6 +1656,8 @@ namespace BLL
|
|||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
WorkAreaId=newItem.WorkAreaId
|
||||
};
|
||||
if (newItem.States == Const.State_0)
|
||||
{
|
||||
|
|
@ -1400,6 +1710,7 @@ namespace BLL
|
|||
updateRadialWork.WatchManContact = newRadialWork.WatchManContact;
|
||||
updateRadialWork.NextManId = newRadialWork.NextManId;
|
||||
updateRadialWork.States = newRadialWork.States;
|
||||
updateRadialWork.WorkAreaId = newItem.WorkAreaId;
|
||||
}
|
||||
updateRadialWork.States = newRadialWork.States;
|
||||
}
|
||||
|
|
@ -1430,6 +1741,11 @@ namespace BLL
|
|||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
WorkAreaId=newItem.WorkAreaId,
|
||||
Reason=newItem.Reason,
|
||||
FireWatchManName=newItem.FireWatchManName,
|
||||
|
||||
};
|
||||
if (newItem.States == Const.State_0)
|
||||
{
|
||||
|
|
@ -1479,6 +1795,10 @@ namespace BLL
|
|||
updateOpenCircuit.SafeMeasures = newOpenCircuit.SafeMeasures;
|
||||
updateOpenCircuit.NextManId = newOpenCircuit.NextManId;
|
||||
updateOpenCircuit.States = newOpenCircuit.States;
|
||||
|
||||
updateOpenCircuit.WorkAreaId = newItem.WorkAreaId;
|
||||
updateOpenCircuit.Reason = newItem.Reason;
|
||||
updateOpenCircuit.FireWatchManName = newItem.FireWatchManName;
|
||||
}
|
||||
updateOpenCircuit.States = newOpenCircuit.States;
|
||||
}
|
||||
|
|
@ -1508,6 +1828,10 @@ namespace BLL
|
|||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
WorkAreaId=newItem.WorkAreaId,
|
||||
Reason=newItem.Reason,
|
||||
FireWatchManName=newItem.FireWatchManName
|
||||
};
|
||||
if (newItem.States == Const.State_0)
|
||||
{
|
||||
|
|
@ -1556,6 +1880,10 @@ namespace BLL
|
|||
updateBreakGround.WorkMeasures = newBreakGround.WorkMeasures;
|
||||
updateBreakGround.NextManId = newBreakGround.NextManId;
|
||||
updateBreakGround.States = newBreakGround.States;
|
||||
|
||||
updateBreakGround.WorkAreaId = newItem.WorkAreaId;
|
||||
updateBreakGround.Reason = newItem.Reason;
|
||||
updateBreakGround.FireWatchManName = newItem.FireWatchManName;
|
||||
}
|
||||
updateBreakGround.States = newBreakGround.States;
|
||||
}
|
||||
|
|
@ -1669,6 +1997,15 @@ namespace BLL
|
|||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
WorkAreaId=newItem.WorkAreaId,
|
||||
LiftingHeight=newItem.LiftingHeight,
|
||||
FireWatchManName=newItem.FireWatchManName,
|
||||
WorkLeaderName=newItem.WorkLeaderName,
|
||||
WorkLeaderTel=newItem.WorkLeaderTel,
|
||||
QzgName=newItem.QzgName,
|
||||
QzgPhone=newItem.QzgPhone,
|
||||
|
||||
};
|
||||
if (newItem.States == Const.State_0)
|
||||
{
|
||||
|
|
@ -1718,12 +2055,112 @@ namespace BLL
|
|||
updateLiftingWork.CraneCapacity = newLiftingWork.CraneCapacity;
|
||||
updateLiftingWork.NextManId = newLiftingWork.NextManId;
|
||||
updateLiftingWork.States = newLiftingWork.States;
|
||||
|
||||
updateLiftingWork.WorkAreaId = newItem.WorkAreaId;
|
||||
updateLiftingWork.LiftingHeight = newItem.LiftingHeight;
|
||||
updateLiftingWork.FireWatchManName = newItem.FireWatchManName;
|
||||
updateLiftingWork.WorkLeaderName = newItem.WorkLeaderName;
|
||||
updateLiftingWork.WorkLeaderTel = newItem.WorkLeaderTel;
|
||||
updateLiftingWork.QzgName = newItem.QzgName;
|
||||
updateLiftingWork.QzgPhone = newItem.QzgPhone;
|
||||
}
|
||||
updateLiftingWork.States = newLiftingWork.States;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 临时用电作业票
|
||||
if (newItem.MenuId == Const.ProjectElectricityMenuId)
|
||||
{
|
||||
Model.License_Electricity newElectricity = new Model.License_Electricity
|
||||
{
|
||||
ElectricityId = strLicenseId,
|
||||
ProjectId = projectId,
|
||||
LicenseCode = newItem.LicenseCode,
|
||||
ApplyUnitId = newItem.ApplyUnitId,
|
||||
ApplyManId = newItem.ApplyManId,
|
||||
ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate),
|
||||
WorkPalce = newItem.WorkPalce,
|
||||
WorkDepth = newItem.WorkDepth,
|
||||
ValidityStartTime = Funs.GetNewDateTime(newItem.ValidityStartTime),
|
||||
ValidityEndTime = Funs.GetNewDateTime(newItem.ValidityEndTime),
|
||||
WorkMeasures = newItem.WorkMeasures,
|
||||
CancelManId = newItem.CancelManId,
|
||||
CancelReasons = newItem.CancelReasons,
|
||||
CancelTime = Funs.GetNewDateTime(newItem.CancelTime),
|
||||
CloseManId = newItem.CloseManId,
|
||||
CloseReasons = newItem.CloseReasons,
|
||||
CloseTime = Funs.GetNewDateTime(newItem.CloseTime),
|
||||
NextManId = newItem.NextManId,
|
||||
States = newItem.States,
|
||||
|
||||
WorkAreaId = newItem.WorkAreaId,
|
||||
Reason = newItem.Reason,
|
||||
FireWatchManName = newItem.FireWatchManName,
|
||||
WorkLeaderName= newItem.WorkLeaderName,
|
||||
WorkLeaderTel = newItem.WorkLeaderTel
|
||||
};
|
||||
if (newItem.States == Const.State_0)
|
||||
{
|
||||
newElectricity.NextManId = newItem.ApplyManId;
|
||||
}
|
||||
////保存
|
||||
var updateElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == strLicenseId);
|
||||
if (updateElectricity == null)
|
||||
{
|
||||
newElectricity.ApplyDate = DateTime.Now;
|
||||
strLicenseId = newElectricity.ElectricityId = SQLHelper.GetNewID();
|
||||
newElectricity.OldLicenseId = newItem.OldLicenseId;
|
||||
newItem.LicenseCode = newElectricity.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectElectricityMenuId, newElectricity.ProjectId, newElectricity.ApplyUnitId);
|
||||
db.License_Electricity.InsertOnSubmit(newElectricity);
|
||||
////增加一条编码记录
|
||||
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectElectricityMenuId, newElectricity.ProjectId, newElectricity.ApplyUnitId, newElectricity.ElectricityId, newElectricity.ApplyDate);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (newItem.States == Const.State_3)
|
||||
{
|
||||
updateElectricity.CloseManId = newElectricity.CloseManId;
|
||||
updateElectricity.CloseReasons = newElectricity.CloseReasons;
|
||||
updateElectricity.CloseTime = DateTime.Now;
|
||||
if (newElectricity.ValidityEndTime.HasValue && newElectricity.ValidityEndTime < DateTime.Now)
|
||||
{
|
||||
updateElectricity.CloseTime = newElectricity.ValidityEndTime;
|
||||
}
|
||||
}
|
||||
else if (newItem.States == Const.State_R)
|
||||
{
|
||||
updateElectricity.CancelManId = newElectricity.CancelManId;
|
||||
updateElectricity.CancelReasons = newElectricity.CancelReasons;
|
||||
updateElectricity.CancelTime = DateTime.Now;
|
||||
if (newElectricity.ValidityEndTime.HasValue && newElectricity.ValidityEndTime < DateTime.Now)
|
||||
{
|
||||
updateElectricity.CancelTime = newElectricity.ValidityEndTime;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
updateElectricity.WorkPalce = newElectricity.WorkPalce;
|
||||
updateElectricity.WorkDepth = newElectricity.WorkDepth;
|
||||
updateElectricity.ValidityStartTime = newElectricity.ValidityStartTime;
|
||||
updateElectricity.ValidityEndTime = newElectricity.ValidityEndTime;
|
||||
updateElectricity.WorkMeasures = newElectricity.WorkMeasures;
|
||||
updateElectricity.NextManId = newElectricity.NextManId;
|
||||
updateElectricity.States = newElectricity.States;
|
||||
|
||||
updateElectricity.WorkAreaId = newItem.WorkAreaId;
|
||||
updateElectricity.Reason = newItem.Reason;
|
||||
updateElectricity.FireWatchManName = newItem.FireWatchManName;
|
||||
updateElectricity.WorkLeaderName = newItem.WorkLeaderName;
|
||||
updateElectricity.WorkLeaderTel = newItem.WorkLeaderTel;
|
||||
|
||||
|
||||
}
|
||||
updateElectricity.States = newElectricity.States;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 作业票【定稿】
|
||||
if (newItem.MenuId == Const.ProjectLicenseManagerMenuId)
|
||||
{
|
||||
|
|
@ -1880,23 +2317,26 @@ namespace BLL
|
|||
#region 新增下一步审核记录
|
||||
if (newItem.IsAgree == true)
|
||||
{
|
||||
var getCloseAllOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && (!x.IsClosed.HasValue || x.IsClosed == false) && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false));
|
||||
if (getCloseAllOperate == null)
|
||||
{
|
||||
var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && x.IsFlowEnd == true);
|
||||
////判断审核步骤是否结束
|
||||
if (getNextFlowOperate != null)
|
||||
{
|
||||
/////最后一步是关闭所有 步骤
|
||||
getNextFlowOperate.IsClosed = true;
|
||||
//修改只需要一个人审批直接通过
|
||||
|
||||
//var getCloseAllOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && (!x.IsClosed.HasValue || x.IsClosed == false) && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false));
|
||||
//if (getCloseAllOperate == null)
|
||||
//{
|
||||
//var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId && x.IsFlowEnd == true);
|
||||
var getNextFlowOperate = db.License_FlowOperate.FirstOrDefault(x => x.DataId == updateFlowOperate.DataId);
|
||||
// ////判断审核步骤是否结束
|
||||
// if (getNextFlowOperate != null)
|
||||
// {
|
||||
/////最后一步是关闭所有 步骤
|
||||
getNextFlowOperate.IsClosed = true;
|
||||
getNextFlowOperate.OperaterTime = DateTime.Now;
|
||||
getNextFlowOperate.IsAgree = true;
|
||||
getNextFlowOperate.OperaterId = newItem.OperaterId;
|
||||
getNextFlowOperate.Opinion = "审核完成！";
|
||||
boolIsFlowEnd = true;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
// }
|
||||
//}
|
||||
|
||||
#region 动火作业票
|
||||
if (strMenuId == Const.ProjectFireWorkMenuId)
|
||||
|
|
@ -2163,6 +2603,39 @@ namespace BLL
|
|||
}
|
||||
#endregion
|
||||
|
||||
#region 临时用电作业票
|
||||
if (strMenuId == Const.ProjectElectricityMenuId)
|
||||
{
|
||||
var getElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == updateFlowOperate.DataId);
|
||||
if (getElectricity != null)
|
||||
{
|
||||
getElectricity.NextManId = newItem.NextOperaterId;
|
||||
if (newItem.IsAgree == true)
|
||||
{
|
||||
if (boolIsFlowEnd == true)
|
||||
{
|
||||
getElectricity.NextManId = null;
|
||||
getElectricity.States = Const.State_2;
|
||||
if (getElectricity.ValidityStartTime.HasValue && getElectricity.ValidityStartTime < DateTime.Now)
|
||||
{
|
||||
int days = 7;
|
||||
if (getElectricity.ValidityEndTime.HasValue)
|
||||
{
|
||||
days = Convert.ToInt32((getElectricity.ValidityEndTime - getElectricity.ValidityStartTime).Value.TotalDays);
|
||||
}
|
||||
getElectricity.ValidityStartTime = DateTime.Now;
|
||||
getElectricity.ValidityEndTime = DateTime.Now.AddDays(days);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
getElectricity.States = Const.State_0;
|
||||
}
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
if (!boolIsFlowEnd && !string.IsNullOrEmpty(newItem.NextOperaterId))
|
||||
{
|
||||
List<string> getUserIds = Funs.GetStrListByStr(newItem.NextOperaterId, ',');
|
||||
|
|
@ -2291,6 +2764,7 @@ namespace BLL
|
|||
var getAllFlows = from x in db.License_FlowOperate
|
||||
where x.DataId == licenseInfo.LicenseId && (!x.IsFlowEnd.HasValue || x.IsFlowEnd == false)
|
||||
select x;
|
||||
|
||||
if (licenseInfo == null || string.IsNullOrEmpty(licenseInfo.LicenseId) || getAllFlows.Count() == 0)
|
||||
{
|
||||
getFlowOperate = (from x in db.Sys_MenuFlowOperate
|
||||
|
|
@ -2617,6 +3091,17 @@ namespace BLL
|
|||
}
|
||||
#endregion
|
||||
|
||||
#region 临时用电作业票
|
||||
else if (newItem.MenuId == Const.ProjectElectricityMenuId)
|
||||
{
|
||||
var updateElectricity = db.License_Electricity.FirstOrDefault(x => x.ElectricityId == strLicenseId);
|
||||
if (updateElectricity == null)
|
||||
{
|
||||
updateElectricity.NextManId = null;
|
||||
updateElectricity.States = Const.State_C;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -808,6 +808,7 @@
|
|||
<Compile Include="ZHGL\Information\MillionsMonthlyReportService.cs" />
|
||||
<Compile Include="ZHGL\Information\SafetyQuarterlyReportService.cs" />
|
||||
<Compile Include="ZHGL\Information\WorkSummaryReportService.cs" />
|
||||
<Compile Include="ZHGL\InspectionSummary\InspectionSummaryService.cs" />
|
||||
<Compile Include="ZHGL\Meeting\CompanySafetyMeetingService.cs" />
|
||||
<Compile Include="ZHGL\Meeting\CompanySpecialMeetingService.cs" />
|
||||
<Compile Include="ZHGL\Person\CompanyBranchPersonService.cs" />
|
||||
|
|
|
|||
|
|
@ -291,6 +291,11 @@ namespace BLL
|
|||
/// </summary>
|
||||
public static string WorkPost_SafetyManager = "e426e560-9906-4aba-843e-2daef9ebeb05";
|
||||
|
||||
/// <summary>
|
||||
/// HSE副经理岗位Id
|
||||
/// </summary>
|
||||
public static string WorkPost_SafetyManagerFu = "46AA7960-1D35-4D5B-8C8F-AA4C874D63C8";
|
||||
|
||||
/// <summary>
|
||||
/// 无损检测工岗位Id
|
||||
/// </summary>
|
||||
|
|
@ -1946,6 +1951,10 @@ namespace BLL
|
|||
/// 吊装作业票
|
||||
/// </summary>
|
||||
public const string ProjectLiftingWorkMenuId = "A1BE3AB6-9D4A-41E7-8870-E73423165451";
|
||||
/// <summary>
|
||||
/// 临时用电作业票
|
||||
/// </summary>
|
||||
public const string ProjectElectricityMenuId = "48F64E0F-38B2-4BDC-9B61-6200BD02CBF5";
|
||||
#endregion
|
||||
|
||||
#region HSSE检查管理
|
||||
|
|
|
|||
|
|
@ -58,6 +58,9 @@ namespace BLL
|
|||
WorkArea = checkSpecialDetail.WorkArea,
|
||||
CheckContent = checkSpecialDetail.CheckContent,
|
||||
HiddenHazardType=checkSpecialDetail.HiddenHazardType,
|
||||
CheckItemSetId= checkSpecialDetail.CheckItemSetId,
|
||||
CheckItemSetContent= checkSpecialDetail.CheckItemSetContent,
|
||||
Rectification_Date= checkSpecialDetail.Rectification_Date
|
||||
};
|
||||
db.Check_CheckSpecialDetail.InsertOnSubmit(newCheckSpecialDetail);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -87,6 +90,10 @@ namespace BLL
|
|||
newCheckSpecialDetail.Suggestions = CheckSpecialDetail.Suggestions;
|
||||
newCheckSpecialDetail.WorkArea = CheckSpecialDetail.WorkArea;
|
||||
newCheckSpecialDetail.CheckContent = CheckSpecialDetail.CheckContent;
|
||||
|
||||
newCheckSpecialDetail.CheckItemSetId = CheckSpecialDetail.CheckItemSetId;
|
||||
newCheckSpecialDetail.CheckItemSetContent = CheckSpecialDetail.CheckItemSetContent;
|
||||
newCheckSpecialDetail.Rectification_Date = CheckSpecialDetail.Rectification_Date;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,6 +76,11 @@ namespace BLL
|
|||
CloseTime = fireWork.CloseTime,
|
||||
NextManId=fireWork.NextManId,
|
||||
States = fireWork.States,
|
||||
|
||||
WorkAreaId=fireWork.WorkAreaId,
|
||||
Reason=fireWork.Reason,
|
||||
FireLevel=fireWork.FireLevel,
|
||||
|
||||
};
|
||||
db.License_FireWork.InsertOnSubmit(newFireWork);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -105,7 +110,11 @@ namespace BLL
|
|||
newFireWork.CloseReasons = fireWork.CloseReasons;
|
||||
newFireWork.CloseTime = fireWork.CloseTime;
|
||||
newFireWork.NextManId = fireWork.NextManId;
|
||||
newFireWork.States = fireWork.States;
|
||||
newFireWork.States = fireWork.States;
|
||||
|
||||
newFireWork.WorkAreaId = fireWork.WorkAreaId;
|
||||
newFireWork.Reason = fireWork.Reason;
|
||||
newFireWork.FireLevel = fireWork.FireLevel;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
@ -172,6 +181,14 @@ namespace BLL
|
|||
CloseTime = heightWork.CloseTime,
|
||||
NextManId = heightWork.NextManId,
|
||||
States = heightWork.States,
|
||||
|
||||
WorkAreaId=heightWork.WorkAreaId,
|
||||
WorkHeight=heightWork.WorkHeight,
|
||||
HeightLevel=heightWork.HeightLevel,
|
||||
FireWatchManName=heightWork.FireWatchManName,
|
||||
WorkLeaderName=heightWork.WorkLeaderName,
|
||||
WorkLeaderTel= heightWork.WorkLeaderTel,
|
||||
|
||||
};
|
||||
db.License_HeightWork.InsertOnSubmit(newHeightWork);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -203,6 +220,13 @@ namespace BLL
|
|||
newHeightWork.CloseTime = heightWork.CloseTime;
|
||||
newHeightWork.NextManId = heightWork.NextManId;
|
||||
newHeightWork.States = heightWork.States;
|
||||
|
||||
newHeightWork.WorkAreaId = heightWork.WorkAreaId;
|
||||
newHeightWork.WorkHeight = heightWork.WorkHeight;
|
||||
newHeightWork.HeightLevel = heightWork.HeightLevel;
|
||||
newHeightWork.FireWatchManName = heightWork.FireWatchManName;
|
||||
newHeightWork.WorkLeaderName = heightWork.WorkLeaderName;
|
||||
newHeightWork.WorkLeaderTel = heightWork.WorkLeaderTel;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
@ -269,6 +293,16 @@ namespace BLL
|
|||
CloseTime = limitedSpace.CloseTime,
|
||||
NextManId = limitedSpace.NextManId,
|
||||
States = limitedSpace.States,
|
||||
|
||||
WorkAreaId=limitedSpace.WorkAreaId,
|
||||
LimitedDescribe=limitedSpace.LimitedDescribe,
|
||||
IsBoolOther=limitedSpace.IsBoolOther,
|
||||
IsBoolHarmfulGas=limitedSpace.IsBoolHarmfulGas,
|
||||
TestResult=limitedSpace.TestResult,
|
||||
TestDate=limitedSpace.TestDate,
|
||||
TestPerson=limitedSpace.TestPerson,
|
||||
VenStep=limitedSpace.VenStep,
|
||||
|
||||
};
|
||||
db.License_LimitedSpace.InsertOnSubmit(newLimitedSpace);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -299,6 +333,15 @@ namespace BLL
|
|||
newLimitedSpace.CloseTime = limitedSpace.CloseTime;
|
||||
newLimitedSpace.NextManId = limitedSpace.NextManId;
|
||||
newLimitedSpace.States = limitedSpace.States;
|
||||
|
||||
newLimitedSpace.WorkAreaId = limitedSpace.WorkAreaId;
|
||||
newLimitedSpace.LimitedDescribe = limitedSpace.LimitedDescribe;
|
||||
newLimitedSpace.IsBoolOther = limitedSpace.IsBoolOther;
|
||||
newLimitedSpace.IsBoolHarmfulGas = limitedSpace.IsBoolHarmfulGas;
|
||||
newLimitedSpace.TestResult = limitedSpace.TestResult;
|
||||
newLimitedSpace.TestDate = limitedSpace.TestDate;
|
||||
newLimitedSpace.TestPerson = limitedSpace.TestPerson;
|
||||
newLimitedSpace.VenStep = limitedSpace.VenStep;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
@ -368,6 +411,9 @@ namespace BLL
|
|||
CloseTime = radialWork.CloseTime,
|
||||
NextManId = radialWork.NextManId,
|
||||
States = radialWork.States,
|
||||
|
||||
WorkAreaId=radialWork.WorkAreaId,
|
||||
|
||||
};
|
||||
db.License_RadialWork.InsertOnSubmit(newRadialWork);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -408,6 +454,8 @@ namespace BLL
|
|||
newRadialWork.CloseTime = radialWork.CloseTime;
|
||||
newRadialWork.NextManId = radialWork.NextManId;
|
||||
newRadialWork.States = radialWork.States;
|
||||
|
||||
newRadialWork.WorkAreaId = radialWork.WorkAreaId;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
@ -476,6 +524,11 @@ namespace BLL
|
|||
CloseTime = openCircuit.CloseTime,
|
||||
NextManId = openCircuit.NextManId,
|
||||
States = openCircuit.States,
|
||||
|
||||
WorkAreaId=openCircuit.WorkAreaId,
|
||||
Reason=openCircuit.Reason,
|
||||
FireWatchManName=openCircuit.FireWatchManName,
|
||||
|
||||
};
|
||||
db.License_OpenCircuit.InsertOnSubmit(newOpenCircuit);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -507,6 +560,10 @@ namespace BLL
|
|||
newOpenCircuit.CloseTime = openCircuit.CloseTime;
|
||||
newOpenCircuit.NextManId = openCircuit.NextManId;
|
||||
newOpenCircuit.States = openCircuit.States;
|
||||
|
||||
newOpenCircuit.WorkAreaId = openCircuit.WorkAreaId;
|
||||
newOpenCircuit.Reason = openCircuit.Reason;
|
||||
newOpenCircuit.FireWatchManName = openCircuit.FireWatchManName;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
@ -572,6 +629,11 @@ namespace BLL
|
|||
CloseTime = breakGround.CloseTime,
|
||||
NextManId = breakGround.NextManId,
|
||||
States = breakGround.States,
|
||||
|
||||
WorkAreaId=breakGround.WorkAreaId,
|
||||
Reason=breakGround.Reason,
|
||||
FireWatchManName=breakGround.FireWatchManName,
|
||||
|
||||
};
|
||||
db.License_BreakGround.InsertOnSubmit(newBreakGround);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -602,6 +664,10 @@ namespace BLL
|
|||
newBreakGround.CloseTime = breakGround.CloseTime;
|
||||
newBreakGround.NextManId = breakGround.NextManId;
|
||||
newBreakGround.States = breakGround.States;
|
||||
|
||||
newBreakGround.WorkAreaId = breakGround.WorkAreaId;
|
||||
newBreakGround.Reason = breakGround.Reason;
|
||||
newBreakGround.FireWatchManName = breakGround.FireWatchManName;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
@ -771,6 +837,15 @@ namespace BLL
|
|||
CloseTime = liftingWork.CloseTime,
|
||||
NextManId = liftingWork.NextManId,
|
||||
States = liftingWork.States,
|
||||
|
||||
WorkAreaId=liftingWork.WorkAreaId,
|
||||
LiftingHeight=liftingWork.LiftingHeight,
|
||||
FireWatchManName=liftingWork.FireWatchManName,
|
||||
WorkLeaderName=liftingWork.WorkLeaderName,
|
||||
WorkLeaderTel=liftingWork.WorkLeaderTel,
|
||||
QzgName=liftingWork.QzgName,
|
||||
QzgPhone=liftingWork.QzgPhone,
|
||||
|
||||
};
|
||||
db.License_LiftingWork.InsertOnSubmit(newLiftingWork);
|
||||
db.SubmitChanges();
|
||||
|
|
@ -802,6 +877,14 @@ namespace BLL
|
|||
newLiftingWork.CloseTime = liftingWork.CloseTime;
|
||||
newLiftingWork.NextManId = liftingWork.NextManId;
|
||||
newLiftingWork.States = liftingWork.States;
|
||||
|
||||
newLiftingWork.WorkAreaId = liftingWork.WorkAreaId;
|
||||
newLiftingWork.LiftingHeight = liftingWork.LiftingHeight;
|
||||
newLiftingWork.FireWatchManName = liftingWork.FireWatchManName;
|
||||
newLiftingWork.WorkLeaderName = liftingWork.WorkLeaderName;
|
||||
newLiftingWork.WorkLeaderTel = liftingWork.WorkLeaderTel;
|
||||
newLiftingWork.QzgName = liftingWork.QzgName;
|
||||
newLiftingWork.QzgPhone = liftingWork.QzgPhone;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
|
@ -828,6 +911,117 @@ namespace BLL
|
|||
}
|
||||
#endregion
|
||||
|
||||
#region 临时用电作业票
|
||||
/// <summary>
|
||||
/// 根据主键获取临时用电作业票
|
||||
/// </summary>
|
||||
/// <param name="ElectricityId"></param>
|
||||
/// <returns></returns>
|
||||
public static Model.License_Electricity GetElectricityById(string ElectricityId)
|
||||
{
|
||||
return Funs.DB.License_Electricity.FirstOrDefault(e => e.ElectricityId == ElectricityId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加临时用电作业票
|
||||
/// </summary>
|
||||
/// <param name="Electricity"></param>
|
||||
public static void AddElectricity(Model.License_Electricity Electricity)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.License_Electricity newElectricity = new Model.License_Electricity
|
||||
{
|
||||
ElectricityId = Electricity.ElectricityId,
|
||||
ProjectId = Electricity.ProjectId,
|
||||
LicenseCode = Electricity.LicenseCode,
|
||||
ApplyUnitId = Electricity.ApplyUnitId,
|
||||
ApplyManId = Electricity.ApplyManId,
|
||||
ApplyDate = Electricity.ApplyDate,
|
||||
WorkPalce = Electricity.WorkPalce,
|
||||
WorkDepth = Electricity.WorkDepth,
|
||||
ValidityStartTime = Electricity.ValidityStartTime,
|
||||
ValidityEndTime = Electricity.ValidityEndTime,
|
||||
WorkMeasures = Electricity.WorkMeasures,
|
||||
CancelManId = Electricity.CancelManId,
|
||||
CancelReasons = Electricity.CancelReasons,
|
||||
CancelTime = Electricity.CancelTime,
|
||||
CloseManId = Electricity.CloseManId,
|
||||
CloseReasons = Electricity.CloseReasons,
|
||||
CloseTime = Electricity.CloseTime,
|
||||
NextManId = Electricity.NextManId,
|
||||
States = Electricity.States,
|
||||
|
||||
WorkAreaId= Electricity.WorkAreaId,
|
||||
Reason = Electricity.Reason,
|
||||
FireWatchManName = Electricity.FireWatchManName,
|
||||
WorkLeaderName = Electricity.WorkLeaderName,
|
||||
WorkLeaderTel = Electricity.WorkLeaderTel,
|
||||
|
||||
|
||||
};
|
||||
db.License_Electricity.InsertOnSubmit(newElectricity);
|
||||
db.SubmitChanges();
|
||||
////增加一条编码记录
|
||||
CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitId(Const.ProjectElectricityMenuId, Electricity.ProjectId, Electricity.ApplyUnitId, Electricity.ElectricityId, Electricity.ApplyDate);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改临时用电作业票
|
||||
/// </summary>
|
||||
/// <param name="Electricity"></param>
|
||||
public static void UpdateElectricity(Model.License_Electricity Electricity)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.License_Electricity newElectricity = db.License_Electricity.FirstOrDefault(e => e.ElectricityId == Electricity.ElectricityId);
|
||||
if (newElectricity != null)
|
||||
{
|
||||
newElectricity.WorkPalce = Electricity.WorkPalce;
|
||||
newElectricity.WorkDepth = Electricity.WorkDepth;
|
||||
newElectricity.ValidityStartTime = Electricity.ValidityStartTime;
|
||||
newElectricity.ValidityEndTime = Electricity.ValidityEndTime;
|
||||
newElectricity.WorkMeasures = Electricity.WorkMeasures;
|
||||
newElectricity.CancelManId = Electricity.CancelManId;
|
||||
newElectricity.CancelReasons = Electricity.CancelReasons;
|
||||
newElectricity.CancelTime = Electricity.CancelTime;
|
||||
newElectricity.CloseManId = Electricity.CloseManId;
|
||||
newElectricity.CloseReasons = Electricity.CloseReasons;
|
||||
newElectricity.CloseTime = Electricity.CloseTime;
|
||||
newElectricity.NextManId = Electricity.NextManId;
|
||||
newElectricity.States = Electricity.States;
|
||||
|
||||
newElectricity.WorkAreaId = Electricity.WorkAreaId;
|
||||
newElectricity.Reason = Electricity.Reason;
|
||||
newElectricity.FireWatchManName = Electricity.FireWatchManName;
|
||||
newElectricity.WorkLeaderName = Electricity.WorkLeaderName;
|
||||
newElectricity.WorkLeaderTel = Electricity.WorkLeaderTel;
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据主键删除临时用电作业票
|
||||
/// </summary>
|
||||
/// <param name="ElectricityId"></param>
|
||||
public static void DeleteElectricityById(string ElectricityId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.License_Electricity Electricity = db.License_Electricity.FirstOrDefault(e => e.ElectricityId == ElectricityId);
|
||||
if (Electricity != null)
|
||||
{
|
||||
///删除编码表记录
|
||||
CodeRecordsService.DeleteCodeRecordsByDataId(ElectricityId);
|
||||
////删除附件
|
||||
CommonService.DeleteAttachFileById(ElectricityId);
|
||||
///删除-安全措施
|
||||
DeleteLicenseItemByDataId(ElectricityId);
|
||||
///删除作业票审核信息
|
||||
DeleteFlowOperateByDataId(ElectricityId);
|
||||
db.License_Electricity.DeleteOnSubmit(Electricity);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#endregion
|
||||
|
||||
#region 作业票-安全措施
|
||||
|
|
|
|||
|
|
@ -397,7 +397,10 @@ namespace BLL
|
|||
/// <returns>HSE人员的数量</returns>
|
||||
public static int GetHSEPersonCountByUnitId(string unitId, string projectId)
|
||||
{
|
||||
var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && (x.WorkPostId == BLL.Const.WorkPost_HSSEEngineer || x.WorkPostId == BLL.Const.WorkPost_SafetyManager) && x.IsUsed == true select x).ToList();
|
||||
var q = (from x in Funs.DB.SitePerson_Person
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where x.UnitId == unitId && x.ProjectId == projectId && y.IsHsse==true && x.IsUsed == true select x).ToList();
|
||||
//var q = (from x in Funs.DB.SitePerson_Person where x.UnitId == unitId && x.ProjectId == projectId && (x.WorkPostId == BLL.Const.WorkPost_HSSEEngineer || x.WorkPostId == BLL.Const.WorkPost_SafetyManager) && x.IsUsed == true select x).ToList();
|
||||
return q.Count();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -155,5 +155,26 @@ namespace BLL
|
|||
}
|
||||
return name;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检查项明细下拉框
|
||||
/// </summary>
|
||||
/// <param name="dropName">下拉框名字</param>
|
||||
/// <param name="isShowPlease">是否显示请选择</param>
|
||||
public static void InitCheckItemDetailDropDownList(FineUIPro.DropDownList dropName, string checkItemSetId, bool isShowPlease)
|
||||
{
|
||||
dropName.DataValueField = "CheckContent";
|
||||
dropName.DataTextField = "CheckContent";
|
||||
dropName.DataSource = (from x in Funs.DB.Technique_CheckItemDetail
|
||||
where x.CheckItemSetId == checkItemSetId
|
||||
orderby x.SortIndex
|
||||
select x).ToList();
|
||||
dropName.DataBind();
|
||||
if (isShowPlease)
|
||||
{
|
||||
Funs.FineUIPleaseSelect(dropName);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -272,8 +272,8 @@ namespace BLL
|
|||
{
|
||||
try
|
||||
{
|
||||
DateTime dateS = DateTime.Now.AddMonths(-6);
|
||||
dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-6).Year + "-" + DateTime.Now.AddMonths(-6).Month + "-01");
|
||||
DateTime dateS = DateTime.Now.AddMonths(-12);
|
||||
dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-12).Year + "-" + DateTime.Now.AddMonths(-12).Month + "-01");
|
||||
var getNums = from x in db.SitePerson_PersonInOutNumber
|
||||
where x.ProjectId == projectId && x.InOutDate >= dateS
|
||||
orderby x.InOutDate
|
||||
|
|
|
|||
|
|
@ -72,9 +72,9 @@ namespace BLL
|
|||
/// <param name="startTime"></param>
|
||||
/// <param name="endTime"></param>
|
||||
/// <returns></returns>
|
||||
public static List<Model.ChartAnalysisItem> RectifyNoticesStatistics(string projectId, string unitId, DateTime? startTime, DateTime? endTime)
|
||||
public static List<Model.RecityNoticesItem> RectifyNoticesStatistics(string projectId, string unitId, DateTime? startTime, DateTime? endTime)
|
||||
{
|
||||
List<Model.ChartAnalysisItem> GetCheckStatistics = new List<Model.ChartAnalysisItem>();
|
||||
List<Model.RecityNoticesItem> GetCheckStatistics = new List<Model.RecityNoticesItem>();
|
||||
var getProjects = ProjectService.GetProjectWorkList();
|
||||
if (projectId != Const._Null && !string.IsNullOrEmpty(projectId))
|
||||
{
|
||||
|
|
@ -89,38 +89,127 @@ namespace BLL
|
|||
}
|
||||
foreach (var item in getUnits)
|
||||
{
|
||||
var getHazardRegister = from x in Funs.DB.Check_RectifyNotices
|
||||
where x.ProjectId == pitem.ProjectId && x.UnitId == item.UnitId
|
||||
&& x.States != "0"
|
||||
select x;
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckedDate >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckedDate <= endTime);
|
||||
}
|
||||
Model.ChartAnalysisItem newItem = new Model.ChartAnalysisItem
|
||||
|
||||
Model.RecityNoticesItem newItem = new Model.RecityNoticesItem
|
||||
{
|
||||
DataId = SQLHelper.GetNewID(),
|
||||
DataAllName = pitem.ProjectName,
|
||||
DataName = item.UnitName,
|
||||
};
|
||||
newItem.DataSumCount = getHazardRegister.Count();
|
||||
newItem.DataCount1 = getHazardRegister.Where(x => x.States == "1").Count();
|
||||
newItem.DataCount2 = getHazardRegister.Where(x => x.States == "2").Count();
|
||||
newItem.DataCount3 = getHazardRegister.Where(x => x.States == "3").Count();
|
||||
newItem.DataCount4 = getHazardRegister.Where(x => x.States == "4").Count();
|
||||
newItem.DataCount5 = getHazardRegister.Where(x => x.States == "5").Count();
|
||||
if (newItem.DataCount2 > 0)
|
||||
//安全巡检隐患数
|
||||
var getHazardRegister = from x in Funs.DB.View_Hazard_HazardRegister
|
||||
where x.ProblemTypes == "1" && x.ProjectId == pitem.ProjectId && x.ResponsibleUnit == item.UnitId
|
||||
select x;
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
newItem.DataCountRate = (float)newItem.DataCount5 / (float)newItem.DataCount2 * 100;
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckTime >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getHazardRegister = getHazardRegister.Where(x => x.CheckTime <= endTime);
|
||||
}
|
||||
newItem.DataSumCount1 = getHazardRegister.Where(x=>x.Type==0).Count();
|
||||
newItem.DataSumCountYzg1 = getHazardRegister.Where(x => x.Type == 0 && x.States == "2").Count();
|
||||
newItem.DataSumCountDzg1 = getHazardRegister.Where(x => x.Type == 0 && x.States == "1").Count();
|
||||
if (newItem.DataSumCountYzg1 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl1 =Math.Round((float)newItem.DataSumCountYzg1 / (float)newItem.DataSumCount1 * 100,2).ToString()+"%";
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataCountRate = 0;
|
||||
newItem.DataSumCountZgl1 ="0%";
|
||||
}
|
||||
|
||||
|
||||
//常规巡检隐患数
|
||||
newItem.DataSumCount2 = getHazardRegister.Where(x => x.Type == 1).Count();
|
||||
newItem.DataSumCountYzg2 = getHazardRegister.Where(x => x.Type == 1 && x.States == "2").Count();
|
||||
newItem.DataSumCountDzg2 = getHazardRegister.Where(x => x.Type == 1 && x.States == "1").Count();
|
||||
if (newItem.DataSumCountYzg2 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl2 = Math.Round((float)newItem.DataSumCountYzg2 / (float)newItem.DataSumCount2 * 100, 2).ToString() + "%";
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataSumCountZgl2 = "0%";
|
||||
}
|
||||
|
||||
//专项检查隐患数
|
||||
var getCheckSpecial = from x in Funs.DB.Check_CheckSpecialDetail
|
||||
join y in Funs.DB.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
|
||||
where x.UnitId == item.UnitId && y.ProjectId == pitem.ProjectId
|
||||
select new { y.CheckTime,x.UnitId,y.ProjectId,x.CompleteStatus };
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
getCheckSpecial = getCheckSpecial.Where(x => x.CheckTime >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getCheckSpecial = getCheckSpecial.Where(x => x.CheckTime <= endTime);
|
||||
}
|
||||
newItem.DataSumCount3= getCheckSpecial.Count();
|
||||
newItem.DataSumCountYzg3 = getCheckSpecial.Where(x =>x.CompleteStatus == true).Count();
|
||||
newItem.DataSumCountDzg3 = getCheckSpecial.Where(x =>x.CompleteStatus == false).Count();
|
||||
if (newItem.DataSumCountYzg3 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl3 =Math.Round((float)newItem.DataSumCountYzg3 / (float)newItem.DataSumCount3 * 100, 2).ToString() + "%"; ;
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataSumCountZgl3 = "0%";
|
||||
}
|
||||
|
||||
//综合检查隐患数
|
||||
var getCheckColligation = from x in Funs.DB.Check_CheckColligationDetail
|
||||
join y in Funs.DB.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
|
||||
where x.UnitId == item.UnitId && y.ProjectId == pitem.ProjectId
|
||||
select new { y.CheckTime, x.UnitId, y.ProjectId, x.CompleteStatus };
|
||||
if (startTime.HasValue)
|
||||
{
|
||||
getCheckColligation = getCheckColligation.Where(x => x.CheckTime >= startTime);
|
||||
}
|
||||
if (endTime.HasValue)
|
||||
{
|
||||
getCheckColligation = getCheckColligation.Where(x => x.CheckTime <= endTime);
|
||||
}
|
||||
newItem.DataSumCount4 = getCheckColligation.Count();
|
||||
newItem.DataSumCountYzg4 = getCheckColligation.Where(x => x.CompleteStatus == true).Count();
|
||||
newItem.DataSumCountDzg4 = getCheckColligation.Where(x => x.CompleteStatus == false).Count();
|
||||
if (newItem.DataSumCountYzg4 > 0)
|
||||
{
|
||||
newItem.DataSumCountZgl4 = Math.Round((float)newItem.DataSumCountYzg4 / (float)newItem.DataSumCount4 * 100, 2).ToString();
|
||||
}
|
||||
else
|
||||
{
|
||||
newItem.DataSumCountZgl4 = "0%";
|
||||
}
|
||||
|
||||
//var getHazardRegister = from x in Funs.DB.Check_RectifyNotices
|
||||
// where x.ProjectId == pitem.ProjectId && x.UnitId == item.UnitId
|
||||
// && x.States != "0"
|
||||
// select x;
|
||||
//if (startTime.HasValue)
|
||||
//{
|
||||
// getHazardRegister = getHazardRegister.Where(x => x.CheckedDate >= startTime);
|
||||
//}
|
||||
//if (endTime.HasValue)
|
||||
//{
|
||||
// getHazardRegister = getHazardRegister.Where(x => x.CheckedDate <= endTime);
|
||||
//}
|
||||
//newItem.DataSumCount = getHazardRegister.Count();
|
||||
//newItem.DataCount1 = getHazardRegister.Where(x => x.States == "1").Count();
|
||||
//newItem.DataCount2 = getHazardRegister.Where(x => x.States == "2").Count();
|
||||
//newItem.DataCount3 = getHazardRegister.Where(x => x.States == "3").Count();
|
||||
//newItem.DataCount4 = getHazardRegister.Where(x => x.States == "4").Count();
|
||||
//newItem.DataCount5 = getHazardRegister.Where(x => x.States == "5").Count();
|
||||
//if (newItem.DataCount2 > 0)
|
||||
//{
|
||||
// newItem.DataCountRate = (float)newItem.DataCount5 / (float)newItem.DataCount2 * 100;
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// newItem.DataCountRate = 0;
|
||||
//}
|
||||
GetCheckStatistics.Add(newItem);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -114,9 +114,11 @@ namespace BLL
|
|||
}
|
||||
public static void AddBulkProject_HSSEData_HiddenDangerDetails(List<Model.Project_HSSEData_HiddenDangerDetail> newtables)
|
||||
{
|
||||
|
||||
db.Project_HSSEData_HiddenDangerDetail.InsertAllOnSubmit(newtables);
|
||||
db.SubmitChanges();
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
db.Project_HSSEData_HiddenDangerDetail.InsertAllOnSubmit(newtables);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
public static void UpdateProject_HSSEData_HiddenDangerDetail(Model.Project_HSSEData_HiddenDangerDetail newtable)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
/// <summary>
|
||||
/// 各项目巡查汇总
|
||||
/// </summary>
|
||||
namespace BLL
|
||||
{
|
||||
public class InspectionSummaryService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 批量添加
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
public static void AddAll(List<Model.Inspection_Summary> list)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
db.Inspection_Summary.InsertAllOnSubmit(list);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 修改(暂无)
|
||||
/// </summary>
|
||||
/// <param name="model"></param>
|
||||
public static void Update(Model.Inspection_Summary model)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
Model.Inspection_Summary newmodel = db.Inspection_Summary.FirstOrDefault(e => e.InspectionSummaryId == model.InspectionSummaryId);
|
||||
if (newmodel != null)
|
||||
{
|
||||
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据年月删除
|
||||
/// </summary>
|
||||
/// <param name="CompileDateMonth"></param>
|
||||
public static void Delete(string CompileDateMonth)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
List<Model.Inspection_Summary> list = db.Inspection_Summary.Where(e => e.CompileDateMonth == CompileDateMonth).ToList();
|
||||
if (list.Count>0)
|
||||
{
|
||||
///删除编码表记录
|
||||
db.Inspection_Summary.DeleteAllOnSubmit(list);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -72,9 +72,9 @@ namespace FineUIPro.Web.CQMS.ProcessControl
|
|||
{
|
||||
NextDate = Convert.ToDateTime(StartDate.Year + "-" + StartDate.Month + "-25");
|
||||
//统计所给事件段的全部数量
|
||||
List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, false);
|
||||
List<Model.View_CQMS_InspectionManagementDetail> managementListSunNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, false);
|
||||
//统计所给事件段的合格数量
|
||||
List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NewDate, true);
|
||||
List<Model.View_CQMS_InspectionManagementDetail> managementListOneNumber = BLL.InspectionManagementService.getInspectionManagementDetailListByCNProfessionalIdAndDate(this.CurrUser.LoginProjectId, cNProfessionalId, StartDate, NextDate, true);
|
||||
|
||||
Statistics.CheckDate += string.Format("{0:yyyy-MM-dd}", NextDate);
|
||||
Statistics.SunNumber = managementListSunNumber.Count();
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtProjectName" runat="server" Readonly="true" Label="项目名称" LabelAlign="Right" LabelWidth="120px"
|
||||
MaxLength="50">
|
||||
>
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
|
|
|
|||
|
|
@ -561,19 +561,22 @@ namespace FineUIPro.Web.CQMS.Solution
|
|||
else
|
||||
{
|
||||
constructSolution.State = Const.CQMSConstructSolution_Compile;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(HFConstructSolutionId.Text))
|
||||
}
|
||||
constructSolution.CompileMan = CurrUser.UserId;
|
||||
constructSolution.Edition = Convert.ToInt32(txtEdition.Text);
|
||||
if (!string.IsNullOrEmpty(ConstructSolutionId))
|
||||
{
|
||||
constructSolution.ConstructSolutionId = HFConstructSolutionId.Text;
|
||||
CQMSConstructSolutionService.UpdateConstructSolution(constructSolution);
|
||||
}
|
||||
else
|
||||
{
|
||||
constructSolution.ConstructSolutionId = SQLHelper.GetNewID(typeof(Model.Solution_CQMSConstructSolution));
|
||||
CQMSConstructSolutionService.AddConstructSolution(constructSolution);
|
||||
}
|
||||
constructSolution.CompileMan = CurrUser.UserId;
|
||||
constructSolution.Edition = Convert.ToInt32(txtEdition.Text);
|
||||
|
||||
|
||||
CQMSConstructSolutionService.AddConstructSolution(constructSolution);
|
||||
|
||||
if (saveType == "submit")
|
||||
{
|
||||
Model.Solution_CQMSConstructSolutionApprove approve1 = new Model.Solution_CQMSConstructSolutionApprove();
|
||||
|
|
|
|||
|
|
@ -2401,3 +2401,256 @@
|
|||
出错时间:08/24/2023 15:20:00
|
||||
出错时间:08/24/2023 15:20:00
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:21
|
||||
出错时间:08/30/2023 10:54:21
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:21
|
||||
出错时间:08/30/2023 10:54:21
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:22
|
||||
出错时间:08/30/2023 10:54:22
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:22
|
||||
出错时间:08/30/2023 10:54:22
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:22
|
||||
出错时间:08/30/2023 10:54:22
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:23
|
||||
出错时间:08/30/2023 10:54:23
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:23
|
||||
出错时间:08/30/2023 10:54:23
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:23
|
||||
出错时间:08/30/2023 10:54:23
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:24
|
||||
出错时间:08/30/2023 10:54:24
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:24
|
||||
出错时间:08/30/2023 10:54:24
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:24
|
||||
出错时间:08/30/2023 10:54:24
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:24
|
||||
出错时间:08/30/2023 10:54:24
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:24
|
||||
出错时间:08/30/2023 10:54:24
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:24
|
||||
出错时间:08/30/2023 10:54:24
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:25
|
||||
出错时间:08/30/2023 10:54:25
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:25
|
||||
出错时间:08/30/2023 10:54:25
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:25
|
||||
出错时间:08/30/2023 10:54:25
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:25
|
||||
出错时间:08/30/2023 10:54:25
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:26
|
||||
出错时间:08/30/2023 10:54:26
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:26
|
||||
出错时间:08/30/2023 10:54:26
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:27
|
||||
出错时间:08/30/2023 10:54:27
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:28
|
||||
出错时间:08/30/2023 10:54:28
|
||||
|
||||
|
||||
错误信息开始=====>
|
||||
错误类型:InvalidOperationException
|
||||
错误信息:不能添加已经存在的实体。
|
||||
错误堆栈:
|
||||
在 System.Data.Linq.Table`1.InsertOnSubmit(TEntity entity)
|
||||
在 System.Data.Linq.Table`1.InsertAllOnSubmit[TSubEntity](IEnumerable`1 entities)
|
||||
在 BLL.BOSHENGMonitorService.AddPerson(String projectId, JArray arr, Sys_User user) 位置 E:\工作\五环施工平台\SGGL_CWCEC\SGGL\BLL\BoSheng\BOSHENGMonitorService.cs:行号 323
|
||||
出错时间:08/30/2023 10:54:28
|
||||
出错时间:08/30/2023 10:54:28
|
||||
|
||||
|
|
|
|||
|
|
@ -1062,6 +1062,8 @@
|
|||
<Content Include="HSSE\Law\RulesRegulationsSelectCloumn.aspx" />
|
||||
<Content Include="HSSE\License\BreakGround.aspx" />
|
||||
<Content Include="HSSE\License\BreakGroundView.aspx" />
|
||||
<Content Include="HSSE\License\Electricity.aspx" />
|
||||
<Content Include="HSSE\License\ElectricityView.aspx" />
|
||||
<Content Include="HSSE\License\EquipmentSafetyList.aspx" />
|
||||
<Content Include="HSSE\License\EquipmentSafetyListEdit.aspx" />
|
||||
<Content Include="HSSE\License\EquipmentSafetyListView.aspx" />
|
||||
|
|
@ -1859,6 +1861,7 @@
|
|||
<Content Include="ZHGL\Information\SafetyQuarterlyReportEdit.aspx" />
|
||||
<Content Include="ZHGL\Information\WorkSummaryReport.aspx" />
|
||||
<Content Include="ZHGL\Information\WorkSummaryReportEdit.aspx" />
|
||||
<Content Include="ZHGL\InspectionSummary\InspectionSummary.aspx" />
|
||||
<Content Include="ZHGL\ManagementReport\ReportRemind.aspx" />
|
||||
<Content Include="ZHGL\Meeting\CompanySafetyMeeting.aspx" />
|
||||
<Content Include="ZHGL\Meeting\CompanySafetyMeetingEdit.aspx" />
|
||||
|
|
@ -11598,6 +11601,20 @@
|
|||
<Compile Include="HSSE\License\BreakGroundView.aspx.designer.cs">
|
||||
<DependentUpon>BreakGroundView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HSSE\License\Electricity.aspx.cs">
|
||||
<DependentUpon>Electricity.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HSSE\License\Electricity.aspx.designer.cs">
|
||||
<DependentUpon>Electricity.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HSSE\License\ElectricityView.aspx.cs">
|
||||
<DependentUpon>ElectricityView.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="HSSE\License\ElectricityView.aspx.designer.cs">
|
||||
<DependentUpon>ElectricityView.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="HSSE\License\EquipmentSafetyList.aspx.cs">
|
||||
<DependentUpon>EquipmentSafetyList.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
@ -16442,6 +16459,13 @@
|
|||
<Compile Include="ZHGL\Information\WorkSummaryReportEdit.aspx.designer.cs">
|
||||
<DependentUpon>WorkSummaryReportEdit.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\InspectionSummary\InspectionSummary.aspx.cs">
|
||||
<DependentUpon>InspectionSummary.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\InspectionSummary\InspectionSummary.aspx.designer.cs">
|
||||
<DependentUpon>InspectionSummary.aspx</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="ZHGL\ManagementReport\ReportRemind.aspx.cs">
|
||||
<DependentUpon>ReportRemind.aspx</DependentUpon>
|
||||
<SubType>ASPXCodeBehind</SubType>
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" runat="server" DataIDField="CheckSpecialDetailId"
|
||||
DataKeyNames="CheckSpecialDetailId" ShowGridHeader="true" SortField="SortIndex" SortDirection="ASC"
|
||||
MinHeight="350px" AllowCellEditing="true" ClicksToEdit="1" AllowSorting="true" EnableColumnLines="true" OnPreDataBound="Grid1_PreDataBound"
|
||||
EnableTextSelection="True" OnSort="Grid1_Sort">
|
||||
EnableTextSelection="True" OnSort="Grid1_Sort" AllowColumnLocking="true">
|
||||
<Columns>
|
||||
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
|
||||
TextAlign="Center" />
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="Unqualified" DataField="Unqualified"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" ExpandUnusedSpace="true">
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" >
|
||||
<Editor>
|
||||
<f:TextBox ID="txtUnqualified" runat="server" ShowRedStar="true">
|
||||
</f:TextBox>
|
||||
|
|
@ -98,6 +98,25 @@
|
|||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
|
||||
<f:RenderField Width="400px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查内容" RendererFunction="renderCheckItemDetail">
|
||||
<Editor>
|
||||
<f:DropDownList ID="drpCheckItemDetail" runat="server"
|
||||
OnSelectedIndexChanged="drpCheckItemDetail_SelectedIndexChanged">
|
||||
</f:DropDownList>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
|
||||
<f:RenderField Width="150px" ColumnID="Rectification_Date" DataField="Rectification_Date"
|
||||
FieldType="Date" RendererArgument="yyyy-MM-dd" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改期限" >
|
||||
<Editor>
|
||||
<f:DatePicker runat="server" DateFormatString="yyyy-MM-dd" ID="txtRectification_Date" EnableEdit="false">
|
||||
</f:DatePicker>
|
||||
</Editor>
|
||||
</f:RenderField>
|
||||
|
||||
|
||||
<f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
|
||||
<Editor>
|
||||
|
|
@ -125,10 +144,10 @@
|
|||
</Editor>
|
||||
</f:RenderField>
|
||||
<f:LinkButtonField ColumnID="Delete" Width="50px" EnablePostBack="false" Icon="Delete"
|
||||
HeaderTextAlign="Center" HeaderText="删除" />
|
||||
HeaderTextAlign="Center" HeaderText="删除" EnableLock="true" Locked="true"/>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<%-- <f:Listener Event="beforeedit" Handler="onGridBeforeEdit" />--%>
|
||||
<f:Listener Event="beforeedit" Handler="onGridBeforeEdit" />
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
<f:Listener Event="afteredit" Handler="onGridAfterEdit" />
|
||||
</Listeners>
|
||||
|
|
@ -204,6 +223,25 @@
|
|||
}
|
||||
}
|
||||
|
||||
var drpCheckItemDetailId = '<%= drpCheckItemDetail.ClientID %>';
|
||||
|
||||
function renderCheckItemDetail(value) {
|
||||
return F(drpCheckItemDetailId).getTextByValue(value);
|
||||
}
|
||||
|
||||
//点击检查项给检查项赋值
|
||||
function onGridBeforeEdit(event, value, params) {
|
||||
var grid = F(grid1ClientID);
|
||||
|
||||
if (params.columnId === 'CheckItemSetContent') {
|
||||
var ddlShi = F(drpCheckItemDetailId);
|
||||
var shitext = grid.getCellValue(params.rowId, 'CheckItemSetContent');
|
||||
ddlShi.setEmptyText(shitext);
|
||||
/* ddlShi.loadData(shitext);*/
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -119,6 +119,9 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
{ "UnitName", "" },
|
||||
{ "Unqualified", "" },
|
||||
{ "CheckItemName", "" },
|
||||
//增加检查项内容和日期
|
||||
{ "CheckItemSetContent", "" },
|
||||
{ "Rectification_Date", "" },
|
||||
{ "CompleteStatusName", "" },
|
||||
{ "HandleStepStr", "" },
|
||||
{ "HiddenHazardTypeName", "" },
|
||||
|
|
@ -309,7 +312,9 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
CheckSpecialId = this.CheckSpecialId,
|
||||
CheckContent = values.Value<string>("CheckItemName"),
|
||||
Unqualified = values.Value<string>("Unqualified"),
|
||||
// WorkArea = values.Value<string>("WorkArea"),
|
||||
CheckItemSetContent = values.Value<string>("CheckItemSetContent"),
|
||||
Rectification_Date= values.Value<DateTime>("Rectification_Date"),
|
||||
// WorkArea = values.Value<string>("WorkArea"),
|
||||
};
|
||||
var getUnit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitName == values.Value<string>("UnitName"));
|
||||
if (getUnit != null)
|
||||
|
|
@ -372,7 +377,14 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
if (getCheckItem != null)
|
||||
{
|
||||
newDetail.CheckItem = getCheckItem.CheckItemSetId;
|
||||
//插入检查项内容id
|
||||
var getCheckItemSet = Funs.DB.Technique_CheckItemDetail.FirstOrDefault(x => x.CheckItemSetId == getCheckItem.CheckItemSetId && x.CheckContent == newDetail.CheckItemSetContent);
|
||||
if (getCheckItemSet != null)
|
||||
{
|
||||
newDetail.CheckItemSetId = getCheckItemSet.CheckItemDetailId;
|
||||
}
|
||||
}
|
||||
|
||||
newDetail.SortIndex = rowIndex;
|
||||
Check_CheckSpecialDetailService.AddCheckSpecialDetail(newDetail);
|
||||
detailLists.Add(newDetail);
|
||||
|
|
@ -472,6 +484,9 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
{
|
||||
this.drpSupCheckItemSet.Items.Clear();
|
||||
this.drpCheckItem.Items.Clear();
|
||||
|
||||
//检查项内容清空
|
||||
this.drpCheckItemDetail.Items.Clear();
|
||||
if (this.rbType.SelectedValue == "1")
|
||||
{
|
||||
this.drpSupCheckItemSet.SelectedIndex = 0;
|
||||
|
|
@ -484,14 +499,36 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
Technique_CheckItemSetService.InitCheckItemSetDropDownList(this.drpSupCheckItemSet, "2", "0", false);
|
||||
this.drpSupCheckItemSet.SelectedIndex = 0;
|
||||
Technique_CheckItemSetService.InitCheckItemSetNameDropDownList(this.drpCheckItem, "2", this.drpSupCheckItemSet.SelectedValue, false);
|
||||
//加载检查项内容下拉
|
||||
var getCheckItem = Funs.DB.Technique_CheckItemSet.FirstOrDefault(x => x.SupCheckItem == this.drpSupCheckItemSet.SelectedValue && x.CheckItemName == this.drpCheckItem.SelectedValue);
|
||||
var checkItemSetId = getCheckItem.CheckItemSetId;
|
||||
Technique_CheckItemDetailService.InitCheckItemDetailDropDownList(this.drpCheckItemDetail, checkItemSetId, false);
|
||||
}
|
||||
|
||||
this.drpCheckItem.SelectedValue = null;
|
||||
this.drpCheckItemDetail.SelectedValue = null;
|
||||
}
|
||||
|
||||
protected void drpCheckItem_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
this.drpCheckItemDetail.Items.Clear();
|
||||
this.drpCheckItem.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpCheckItem.SelectedValueArray);
|
||||
|
||||
if (!string.IsNullOrEmpty(this.drpCheckItem.SelectedValue))
|
||||
{
|
||||
//加载检查项内容下拉
|
||||
var getCheckItem = Funs.DB.Technique_CheckItemSet.
|
||||
FirstOrDefault(x => x.SupCheckItem == this.drpSupCheckItemSet.SelectedValue && x.CheckItemName == this.drpCheckItem.SelectedValue);
|
||||
var checkItemSetId = getCheckItem.CheckItemSetId;
|
||||
Technique_CheckItemDetailService.InitCheckItemDetailDropDownList(this.drpCheckItemDetail, checkItemSetId, false);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
protected void drpCheckItemDetail_SelectedIndexChanged(object sender, EventArgs e)
|
||||
{
|
||||
this.drpCheckItemDetail.SelectedValueArray = Funs.RemoveDropDownListNull(this.drpCheckItemDetail.SelectedValueArray);
|
||||
}
|
||||
|
||||
protected void Grid1_Sort(object sender, GridSortEventArgs e)
|
||||
|
|
|
|||
|
|
@ -7,11 +7,13 @@
|
|||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HSSE.Check {
|
||||
|
||||
|
||||
public partial class CheckSpecialEdit {
|
||||
|
||||
namespace FineUIPro.Web.HSSE.Check
|
||||
{
|
||||
|
||||
|
||||
public partial class CheckSpecialEdit
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCheckSpecialCode 控件。
|
||||
/// </summary>
|
||||
|
|
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCheckSpecialCode;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// rbType 控件。
|
||||
/// </summary>
|
||||
|
|
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList rbType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpSupCheckItemSet 控件。
|
||||
/// </summary>
|
||||
|
|
@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpSupCheckItemSet;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtCheckDate 控件。
|
||||
/// </summary>
|
||||
|
|
@ -74,7 +76,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtCheckDate;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpPartInPersons 控件。
|
||||
/// </summary>
|
||||
|
|
@ -83,7 +85,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpPartInPersons;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtPartInPersonNames 控件。
|
||||
/// </summary>
|
||||
|
|
@ -92,7 +94,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtPartInPersonNames;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnNew 控件。
|
||||
/// </summary>
|
||||
|
|
@ -101,7 +103,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNew;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -110,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpCheckArea 控件。
|
||||
/// </summary>
|
||||
|
|
@ -119,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCheckArea;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpWorkUnit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -128,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpWorkUnit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// txtUnqualified 控件。
|
||||
/// </summary>
|
||||
|
|
@ -137,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtUnqualified;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpCheckItem 控件。
|
||||
/// </summary>
|
||||
|
|
@ -146,7 +148,25 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCheckItem;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpCheckItemDetail 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCheckItemDetail;
|
||||
|
||||
/// <summary>
|
||||
/// txtRectification_Date 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker txtRectification_Date;
|
||||
|
||||
/// <summary>
|
||||
/// drpCompleteStatus 控件。
|
||||
/// </summary>
|
||||
|
|
@ -155,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpCompleteStatus;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpHandleStep 控件。
|
||||
/// </summary>
|
||||
|
|
@ -164,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpHandleStep;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// drpHiddenHazardType 控件。
|
||||
/// </summary>
|
||||
|
|
@ -173,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpHiddenHazardType;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -182,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// lbTemp 控件。
|
||||
/// </summary>
|
||||
|
|
@ -191,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbTemp;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnAttachUrl 控件。
|
||||
/// </summary>
|
||||
|
|
@ -200,7 +220,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnAttachUrl;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
|
|
@ -209,7 +229,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnSave 控件。
|
||||
/// </summary>
|
||||
|
|
@ -218,7 +238,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSave;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnSubmit 控件。
|
||||
/// </summary>
|
||||
|
|
@ -227,7 +247,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSubmit;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
|
|
@ -236,7 +256,7 @@ namespace FineUIPro.Web.HSSE.Check {
|
|||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// WindowAtt 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -57,11 +57,18 @@
|
|||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="受检单位">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="200px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" ExpandUnusedSpace="true">
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" >
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="160px" ColumnID="CheckItemName" DataField="CheckItemName" SortField="CheckItemName"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题类型">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="250px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查内容">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="160px" ColumnID="Rectification_Date" DataField="Rectification_Date" SortField="Rectification_Date"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改期限">
|
||||
</f:RenderField>
|
||||
|
||||
<f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
|
||||
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
|
||||
</f:RenderField>
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@
|
|||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患整改单统计" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true" SortField="DataAllName,DataName"
|
||||
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true" ForceFit="true"
|
||||
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True">
|
||||
SortDirection="ASC" OnSort="Grid1_Sort" EnableColumnLines="true" AllowPaging="true"
|
||||
IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" AllowColumnLocking="true">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
</Toolbars>
|
||||
<Columns>
|
||||
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
|
||||
EnableLock="true" Locked="False">
|
||||
EnableLock="true" Locked="true">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
|
|
@ -81,29 +81,53 @@
|
|||
HeaderText="项目" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>--%>
|
||||
<f:RenderField Width="250px" ColumnID="DataName" DataField="DataName" FieldType="String"
|
||||
HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center">
|
||||
HeaderText="单位" TextAlign="Left" HeaderTextAlign="Center" EnableLock="true" Locked="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DataSumCount" DataField="DataSumCount" FieldType="Int"
|
||||
HeaderText="总数" TextAlign="Left" HeaderTextAlign="Center">
|
||||
<f:GroupField HeaderText="安全巡检" TextAlign="Center" Width="400px">
|
||||
<Columns>
|
||||
<f:BoundField Width="100px" DataField="DataSumCount1" HeaderText="隐患数" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountYzg1" HeaderText="已整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountDzg1" HeaderText="待整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountZgl1" HeaderText="整改率" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="常规巡检" TextAlign="Center" Width="400px">
|
||||
<Columns>
|
||||
<f:BoundField Width="100px" DataField="DataSumCount2" HeaderText="隐患数" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountYzg2" HeaderText="已整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountDzg2" HeaderText="待整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountZgl2" HeaderText="整改率" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="专项检查" TextAlign="Center" Width="400px">
|
||||
<Columns>
|
||||
<f:BoundField Width="100px" DataField="DataSumCount3" HeaderText="隐患数" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountYzg3" HeaderText="已整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountDzg3" HeaderText="待整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountZgl3" HeaderText="整改率" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<f:GroupField HeaderText="综合检查" TextAlign="Center" Width="400px">
|
||||
<Columns>
|
||||
<f:BoundField Width="100px" DataField="DataSumCount4" HeaderText="隐患数" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountYzg4" HeaderText="已整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountDzg4" HeaderText="待整改" />
|
||||
<f:BoundField Width="100px" DataField="DataSumCountZgl4" HeaderText="整改率" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
<%-- <f:RenderField Width="100px" ColumnID="DataSumCount" DataField="DataSumCount" FieldType="Int"
|
||||
HeaderText="安全巡检隐患数" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DataCount1" DataField="DataCount1" FieldType="Int"
|
||||
HeaderText="待签发" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DataCount2" DataField="DataCount2" FieldType="Int"
|
||||
HeaderText="待整改" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DataCount3" DataField="DataCount3" FieldType="Int"
|
||||
HeaderText="待审核" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DataCount4" DataField="DataCount4" FieldType="Int"
|
||||
HeaderText="待复查" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DataCount5" DataField="DataCount5" FieldType="Int"
|
||||
HeaderText="已完成" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="DataCountRate" DataField="DataCountRate" FieldType="Float"
|
||||
HeaderText="整改完成率" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>
|
||||
HeaderText="已整改" TextAlign="Left" HeaderTextAlign="Center">
|
||||
</f:RenderField>--%>
|
||||
</Columns>
|
||||
<PageItems>
|
||||
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
using BLL;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Text;
|
||||
using AspNet = System.Web.UI.WebControls;
|
||||
|
|
@ -122,7 +123,7 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
Response.ContentEncoding = System.Text.Encoding.UTF8;
|
||||
this.Grid1.PageSize = this.Grid1.RecordCount;
|
||||
BindGrid();
|
||||
Response.Write(GetGridTableHtml(Grid1));
|
||||
Response.Write(GetGridTableHtmlNew(Grid1));
|
||||
Response.End();
|
||||
}
|
||||
|
||||
|
|
@ -162,6 +163,252 @@ namespace FineUIPro.Web.HSSE.Check
|
|||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 格式化html
|
||||
/// </summary>
|
||||
/// <param name="grid"></param>
|
||||
/// <returns></returns>
|
||||
private string GetGridTableHtmlNew(Grid grid)
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
MultiHeaderTable mht = new MultiHeaderTable();
|
||||
mht.ResolveMultiHeaderTable(Grid1.Columns);
|
||||
|
||||
|
||||
sb.Append("<meta http-equiv=\"Content-Type\" content=\"application/vnd.ms-excel;charset=utf-8\"/>");
|
||||
|
||||
|
||||
sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
|
||||
|
||||
////列数
|
||||
//var rowCount = "";
|
||||
//var list = Funs.DB.Base_Project.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).OrderBy(x => x.ProjectCode).ToList();
|
||||
//for (int i = 0; i < list.Count; i++)
|
||||
//{
|
||||
// rowCount+="{}"
|
||||
//}
|
||||
|
||||
foreach (List<object[]> rows in mht.MultiTable)
|
||||
{
|
||||
sb.Append("<tr>");
|
||||
foreach (object[] cell in rows)
|
||||
{
|
||||
int rowspan = Convert.ToInt32(cell[0]);
|
||||
int colspan = Convert.ToInt32(cell[1]);
|
||||
GridColumn column = cell[2] as GridColumn;
|
||||
|
||||
sb.AppendFormat("<th{0}{1}{2}>{3}</th>",
|
||||
rowspan != 1 ? " rowspan=\"" + rowspan + "\"" : "",
|
||||
colspan != 1 ? " colspan=\"" + colspan + "\"" : "",
|
||||
colspan != 1 ? " style=\"text-align:center;\"" : "",
|
||||
column.HeaderText);
|
||||
}
|
||||
sb.Append("</tr>");
|
||||
}
|
||||
|
||||
|
||||
foreach (GridRow row in grid.Rows)
|
||||
{
|
||||
sb.Append("<tr>");
|
||||
int i = 0;
|
||||
string MenuC = "";
|
||||
foreach (GridColumn column in mht.Columns)
|
||||
{
|
||||
string html = row.Values[column.ColumnIndex].ToString();
|
||||
if (column.ColumnID == "tfNumber")
|
||||
{
|
||||
html = (row.FindControl("spanNumber") as System.Web.UI.HtmlControls.HtmlGenericControl).InnerText;
|
||||
}
|
||||
else if (column.ColumnID == "tfGender")
|
||||
{
|
||||
html = (row.FindControl("labGender") as AspNet.Label).Text;
|
||||
}
|
||||
else if (column.ColumnID == "tfPageIndex")
|
||||
{
|
||||
html = (row.FindControl("lblPageIndex") as AspNet.Label).Text;
|
||||
}
|
||||
|
||||
|
||||
sb.AppendFormat("<td>{0}</td>", html);
|
||||
|
||||
}
|
||||
|
||||
sb.Append("</tr>");
|
||||
}
|
||||
|
||||
sb.Append("</table>");
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
|
||||
|
||||
public static string MidStrEx(string sourse, string startstr, string endstr)
|
||||
{
|
||||
string result = string.Empty;
|
||||
int startindex, endindex;
|
||||
try
|
||||
{
|
||||
startindex = sourse.IndexOf(startstr);
|
||||
if (startindex == -1)
|
||||
return result;
|
||||
string tmpstr = sourse.Substring(startindex + startstr.Length);
|
||||
endindex = tmpstr.IndexOf(endstr);
|
||||
if (endindex == -1)
|
||||
return result;
|
||||
result = tmpstr.Remove(endindex);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
#region 多表头处理
|
||||
|
||||
/// <summary>
|
||||
/// 处理多表头的类
|
||||
/// </summary>
|
||||
public class MultiHeaderTable
|
||||
{
|
||||
// 包含 rowspan，colspan 的多表头，方便生成 HTML 的 table 标签
|
||||
public List<List<object[]>> MultiTable = new List<List<object[]>>();
|
||||
// 最终渲染的列数组
|
||||
public List<GridColumn> Columns = new List<GridColumn>();
|
||||
|
||||
|
||||
public void ResolveMultiHeaderTable(GridColumnCollection columns)
|
||||
{
|
||||
List<object[]> row = new List<object[]>();
|
||||
foreach (GridColumn column in columns)
|
||||
{
|
||||
object[] cell = new object[4];
|
||||
cell[0] = 1; // rowspan
|
||||
cell[1] = 1; // colspan
|
||||
cell[2] = column;
|
||||
cell[3] = null;
|
||||
|
||||
row.Add(cell);
|
||||
}
|
||||
|
||||
ResolveMultiTable(row, 0);
|
||||
|
||||
ResolveColumns(row);
|
||||
}
|
||||
|
||||
private void ResolveColumns(List<object[]> row)
|
||||
{
|
||||
foreach (object[] cell in row)
|
||||
{
|
||||
GroupField groupField = cell[2] as GroupField;
|
||||
if (groupField != null && groupField.Columns.Count > 0)
|
||||
{
|
||||
List<object[]> subrow = new List<object[]>();
|
||||
foreach (GridColumn column in groupField.Columns)
|
||||
{
|
||||
subrow.Add(new object[]
|
||||
{
|
||||
1,
|
||||
1,
|
||||
column,
|
||||
groupField
|
||||
});
|
||||
}
|
||||
|
||||
ResolveColumns(subrow);
|
||||
}
|
||||
else
|
||||
{
|
||||
Columns.Add(cell[2] as GridColumn);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void ResolveMultiTable(List<object[]> row, int level)
|
||||
{
|
||||
List<object[]> nextrow = new List<object[]>();
|
||||
|
||||
foreach (object[] cell in row)
|
||||
{
|
||||
GroupField groupField = cell[2] as GroupField;
|
||||
if (groupField != null && groupField.Columns.Count > 0)
|
||||
{
|
||||
// 如果当前列包含子列，则更改当前列的 colspan，以及增加父列（向上递归）的colspan
|
||||
cell[1] = Convert.ToInt32(groupField.Columns.Count);
|
||||
PlusColspan(level - 1, cell[3] as GridColumn, groupField.Columns.Count - 1);
|
||||
|
||||
foreach (GridColumn column in groupField.Columns)
|
||||
{
|
||||
nextrow.Add(new object[]
|
||||
{
|
||||
1,
|
||||
1,
|
||||
column,
|
||||
groupField
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
MultiTable.Add(row);
|
||||
|
||||
// 如果当前下一行，则增加上一行（向上递归）中没有子列的列的 rowspan
|
||||
if (nextrow.Count > 0)
|
||||
{
|
||||
PlusRowspan(level);
|
||||
|
||||
ResolveMultiTable(nextrow, level + 1);
|
||||
}
|
||||
}
|
||||
|
||||
private void PlusRowspan(int level)
|
||||
{
|
||||
if (level < 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (object[] cells in MultiTable[level])
|
||||
{
|
||||
GroupField groupField = cells[2] as GroupField;
|
||||
if (groupField != null && groupField.Columns.Count > 0)
|
||||
{
|
||||
// ...
|
||||
}
|
||||
else
|
||||
{
|
||||
cells[0] = Convert.ToInt32(cells[0]) + 1;
|
||||
}
|
||||
}
|
||||
|
||||
PlusRowspan(level - 1);
|
||||
}
|
||||
|
||||
private void PlusColspan(int level, GridColumn parent, int plusCount)
|
||||
{
|
||||
if (level < 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (object[] cells in MultiTable[level])
|
||||
{
|
||||
GridColumn column = cells[2] as GridColumn;
|
||||
if (column == parent)
|
||||
{
|
||||
cells[1] = Convert.ToInt32(cells[1]) + plusCount;
|
||||
|
||||
PlusColspan(level - 1, cells[3] as GridColumn, plusCount);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
#endregion
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,122 @@
|
|||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Electricity.aspx.cs" Inherits="FineUIPro.Web.HSSE.License.Electricity" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title>临时用电作业票</title>
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
|
||||
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false"
|
||||
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="临时用电作业票" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="ElectricityId" DataIDField="ElectricityId" AllowSorting="true"
|
||||
SortField="ApplyDate" SortDirection="DESC" EnableColumnLines="true" OnSort="Grid1_Sort" AllowPaging="true"
|
||||
IsDatabasePaging="true" PageSize="10" OnPageIndexChange="Grid1_PageIndexChange" ForceFit="true"
|
||||
EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid1_RowDoubleClick" EnableTextSelection="True">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
<f:DropDownList ID="drpUnit" runat="server" Label="申请单位" Width="350px" LabelWidth="80px"
|
||||
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||
</f:DropDownList>
|
||||
<f:ToolbarSeparator runat="server"></f:ToolbarSeparator>
|
||||
<f:RadioButtonList ID="drpStates" runat="server" Width="450px"
|
||||
AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
|
||||
</f:RadioButtonList>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" ToolTip="导出" Icon="FolderUp"
|
||||
EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:TemplateField ColumnID="tfNumber" Width="55px" HeaderText="序号" HeaderTextAlign="Center"
|
||||
TextAlign="Center">
|
||||
<ItemTemplate>
|
||||
<asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
|
||||
</ItemTemplate>
|
||||
</f:TemplateField>
|
||||
<f:RenderField Width="90px" ColumnID="LicenseCode" DataField="LicenseCode"
|
||||
SortField="LicenseCode" FieldType="String" HeaderText="编号" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="200px" ColumnID="ApplyUnitName" DataField="ApplyUnitName" SortField="ApplyUnitName"
|
||||
FieldType="String" HeaderText="申请单位" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="120px" ColumnID="WorkPalce" DataField="WorkPalce" SortField="WorkPalce"
|
||||
FieldType="String" HeaderText="作业地点" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="WorkLeaderName" DataField="WorkLeaderName" SortField="WorkLeaderName"
|
||||
FieldType="String" HeaderText="安装人姓名" HeaderTextAlign="Center" TextAlign="Left">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="ApplyDate" DataField="ApplyDate" SortField="ApplyDate"
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="申请日期"
|
||||
HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="ValidityStartTime" DataField="ValidityStartTime" SortField="ValidityStartTime"
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期开始时间"
|
||||
HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="150px" ColumnID="ValidityEndTime" DataField="ValidityEndTime" SortField="ValidityEndTime"
|
||||
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd HH:mm" HeaderText="有效期结束时间"
|
||||
HeaderTextAlign="Center" TextAlign="Center">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="160px" ColumnID="WorkMeasures" DataField="WorkMeasures"
|
||||
SortField="WorkMeasures" FieldType="String" HeaderText="作业内容、机具及安全措施" HeaderTextAlign="Center"
|
||||
TextAlign="Left">
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
|
||||
</Listeners>
|
||||
<PageItems>
|
||||
<f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
|
||||
</f:ToolbarSeparator>
|
||||
<f:ToolbarText ID="ToolbarText1" runat="server" Text="每页记录数：">
|
||||
</f:ToolbarText>
|
||||
<f:DropDownList runat="server" ID="ddlPageSize" Width="80px" AutoPostBack="true"
|
||||
OnSelectedIndexChanged="ddlPageSize_SelectedIndexChanged">
|
||||
</f:DropDownList>
|
||||
</PageItems>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<f:Window ID="Window1" Title="临时用电票" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"
|
||||
Width="1000px" Height="640px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuView" OnClick="btnMenuView_Click" EnablePostBack="true"
|
||||
runat="server" Text="查看" Icon="Find">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnPrinter" EnablePostBack="true" runat="server"
|
||||
Text="导出" Icon="Printer" OnClick="btnPrinter_Click" EnableAjax="false" DisableControlBeforePostBack="false">
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnMenuDelete" OnClick="btnMenuDelete_Click" EnablePostBack="true"
|
||||
Hidden="true" Icon="Delete" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server"
|
||||
Text="删除">
|
||||
</f:MenuButton>
|
||||
</f:Menu>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
var menuID = '<%= Menu1.ClientID %>';
|
||||
// 返回false，来阻止浏览器右键菜单
|
||||
function onRowContextMenu(event, rowId) {
|
||||
F(menuID).show(); //showAt(event.pageX, event.pageY);
|
||||
return false;
|
||||
}
|
||||
|
||||
function reloadGrid() {
|
||||
__doPostBack(null, 'reloadGrid');
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,179 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HSSE.License
|
||||
{
|
||||
|
||||
|
||||
public partial class Electricity
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
/// <summary>
|
||||
/// drpUnit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList drpUnit;
|
||||
|
||||
/// <summary>
|
||||
/// drpStates 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RadioButtonList drpStates;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnOut;
|
||||
|
||||
/// <summary>
|
||||
/// lblNumber 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.Label lblNumber;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarSeparator1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarText1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarText ToolbarText1;
|
||||
|
||||
/// <summary>
|
||||
/// ddlPageSize 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DropDownList ddlPageSize;
|
||||
|
||||
/// <summary>
|
||||
/// Window1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window Window1;
|
||||
|
||||
/// <summary>
|
||||
/// Menu1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Menu Menu1;
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuView 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuView;
|
||||
|
||||
/// <summary>
|
||||
/// btnPrinter 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnPrinter;
|
||||
|
||||
/// <summary>
|
||||
/// btnMenuDelete 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.MenuButton btnMenuDelete;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,259 @@
|
|||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ElectricityView.aspx.cs" Inherits="FineUIPro.Web.HSSE.License.ElectricityView" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title>临时用电作业票</title>
|
||||
<link href="../../res/css/common.css" rel="stylesheet" type="text/css" />
|
||||
<style type="text/css">
|
||||
.formtitle .f-field-body {
|
||||
text-align: center;
|
||||
margin: 10px 0;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
|
||||
<f:Form ID="SimpleForm1" ShowBorder="true" ShowHeader="false" AutoScroll="true" TitleAlign="Center"
|
||||
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" EnableTableStyle="true">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Label ID="lbLicenseCode" runat="server" Label="编号" LabelWidth="140px">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Label ID="lbImageUrl" runat="server" Label="临时用电需附简图" LabelWidth="140px" Text="见附件。">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtApplyUnit" runat="server" Label="申请单位" Readonly="true" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtApplyManName" runat="server" Label="申请人" Readonly="true" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtWorkPalce" runat="server" Label="作业地点" Readonly="true" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
<f:TextBox ID="txtReason" runat="server" Label="作业原因" Readonly="true" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtWorkDate" runat="server" Label="有效期限" Readonly="true" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtWorkMeasures" runat="server" Label="作业内容、机具及安全措施" Readonly="true" LabelWidth="120px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="检查措施" EnableCollapse="true"
|
||||
runat="server" BoxFlex="1" DataKeyNames="LicenseItemId" EnableColumnLines="true"
|
||||
DataIDField="LicenseItemId" AllowSorting="true" SortField="SortIndex"
|
||||
SortDirection="ASC" AllowPaging="false" >
|
||||
<Columns>
|
||||
<f:RenderField Width="90px" ColumnID="SortIndex" DataField="SortIndex" FieldType="Int"
|
||||
HeaderText="序号" HeaderTextAlign="Center" TextAlign="Left" >
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="200px" ColumnID="SafetyMeasures" DataField="SafetyMeasures" FieldType="String"
|
||||
HeaderText="检查单" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="ConfirmManName" DataField="ConfirmManName" FieldType="String"
|
||||
HeaderText="确认执行" HeaderTextAlign="Center" TextAlign="Left" >
|
||||
</f:RenderField>
|
||||
<f:RenderField Width="100px" ColumnID="NoUsedName" DataField="NoUsedName" FieldType="String"
|
||||
HeaderText="不适用" HeaderTextAlign="Center" TextAlign="Left" >
|
||||
</f:RenderField>
|
||||
</Columns>
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Form ID="txtForm1" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
|
||||
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全人员意见：">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtOpinion1" runat="server" Readonly="true" Height="50px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow >
|
||||
<Items>
|
||||
<f:Label ID="Label6" runat="server" >
|
||||
</f:Label>
|
||||
<f:Label ID="txtName1" runat="server" Label="签字" LabelWidth="60px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtTime1" runat="server" Text="年月日时分">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
<f:Form ID="txtForm2" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
|
||||
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位安全人员意见：">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtOpinion2" runat="server" Readonly="true" Height="50px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow >
|
||||
<Items>
|
||||
<f:Label ID="Label1" runat="server" >
|
||||
</f:Label>
|
||||
<f:Label ID="txtName2" runat="server" Label="签字" LabelWidth="60px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtTime2" runat="server" Text="年月日时分">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Form ID="txtForm3" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
|
||||
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位专业工程师意见：">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtOpinion3" runat="server" Readonly="true" Height="50px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow >
|
||||
<Items>
|
||||
<f:Label ID="Label2" runat="server" >
|
||||
</f:Label>
|
||||
<f:Label ID="txtName3" runat="server" Label="签字" LabelWidth="60px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtTime3" runat="server" Text="年月日时分">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
<f:Form ID="txtForm4" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
|
||||
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包单位施工经理意见：">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtOpinion4" runat="server" Readonly="true" Height="50px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow >
|
||||
<Items>
|
||||
<f:Label ID="Label5" runat="server" >
|
||||
</f:Label>
|
||||
<f:Label ID="txtName4" runat="server" Label="签字" LabelWidth="60px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtTime4" runat="server" Text="年月日时分">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:Form ID="txtForm5" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
|
||||
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="监理单位意见：">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtOpinion5" runat="server" Readonly="true" Height="50px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow >
|
||||
<Items>
|
||||
<f:Label ID="Label9" runat="server" >
|
||||
</f:Label>
|
||||
<f:Label ID="txtName5" runat="server" Label="签字" LabelWidth="60px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtTime5" runat="server" Text="年月日时分">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
<f:Form ID="txtForm6" ShowBorder="true" ShowHeader="true" AutoScroll="true" TitleAlign="Left"
|
||||
BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="业主单位意见：">
|
||||
<Rows>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextArea ID="txtOpinion6" runat="server" Readonly="true" Height="50px">
|
||||
</f:TextArea>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow >
|
||||
<Items>
|
||||
<f:Label ID="Label12" runat="server" >
|
||||
</f:Label>
|
||||
<f:Label ID="txtName6" runat="server" Label="签字" LabelWidth="60px">
|
||||
</f:Label>
|
||||
<f:Label ID="txtTime6" runat="server" Text="年月日时分">
|
||||
</f:Label>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
</f:Form>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtCance" runat="server" Label="取消" Readonly="true" LabelWidth="90px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
<f:FormRow>
|
||||
<Items>
|
||||
<f:TextBox ID="txtClose" runat="server" Label="关闭" Readonly="true" LabelWidth="90px">
|
||||
</f:TextBox>
|
||||
</Items>
|
||||
</f:FormRow>
|
||||
</Rows>
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
|
||||
<Items>
|
||||
<f:Label runat="server" ID="lbTemp">
|
||||
</f:Label>
|
||||
<f:Button ID="btnAttachUrl" Text="临时用电作业需附简图" ToolTip="临时用电作业需附简图查看" Icon="TableCell" runat="server"
|
||||
OnClick="btnAttachUrl_Click" ValidateForms="SimpleForm1">
|
||||
</f:Button>
|
||||
<f:ToolbarFill ID="ToolbarFill1" runat="server">
|
||||
</f:ToolbarFill>
|
||||
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose" MarginRight="10px">
|
||||
</f:Button>
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
</f:Form>
|
||||
<f:Window ID="WindowAtt" Title="附件" Hidden="true" EnableIFrame="true" EnableMaximize="true"
|
||||
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
|
||||
Height="500px">
|
||||
</f:Window>
|
||||
</form>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,242 @@
|
|||
using BLL;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data;
|
||||
using System.Data.SqlClient;
|
||||
using System.Linq;
|
||||
|
||||
namespace FineUIPro.Web.HSSE.License
|
||||
{
|
||||
public partial class ElectricityView : PageBase
|
||||
{
|
||||
#region 定义项
|
||||
/// <summary>
|
||||
/// 主键
|
||||
/// </summary>
|
||||
private string ElectricityId
|
||||
{
|
||||
get
|
||||
{
|
||||
return (string)ViewState["ElectricityId"];
|
||||
}
|
||||
set
|
||||
{
|
||||
ViewState["ElectricityId"] = value;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 加载
|
||||
/// <summary>
|
||||
/// 加载页面
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void Page_Load(object sender, EventArgs e)
|
||||
{
|
||||
if (!IsPostBack)
|
||||
{
|
||||
this.SimpleForm1.Title = UnitService.GetUnitNameByUnitId(Const.UnitId_CWCEC) + this.Title;
|
||||
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
|
||||
this.ElectricityId = Request.Params["ElectricityId"];
|
||||
if (!string.IsNullOrEmpty(this.ElectricityId))
|
||||
{
|
||||
var getElectricity = LicensePublicService.GetElectricityById(this.ElectricityId);
|
||||
if (getElectricity != null)
|
||||
{
|
||||
this.lbLicenseCode.Text = getElectricity.LicenseCode;
|
||||
this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getElectricity.ApplyUnitId);
|
||||
this.txtApplyManName.Text = UserService.GetUserNameByUserId(getElectricity.ApplyManId);
|
||||
this.txtWorkPalce.Text = getElectricity.WorkPalce;
|
||||
this.txtReason.Text = getElectricity.Reason;
|
||||
if (getElectricity.ValidityStartTime.HasValue)
|
||||
{
|
||||
this.txtWorkDate.Text = getElectricity.ValidityStartTime.Value.ToString("f") + " 至 ";
|
||||
if (getElectricity.ValidityEndTime.HasValue)
|
||||
{
|
||||
this.txtWorkDate.Text += getElectricity.ValidityEndTime.Value.ToString("f");
|
||||
}
|
||||
}
|
||||
this.txtWorkMeasures.Text = getElectricity.WorkMeasures;
|
||||
if (!string.IsNullOrEmpty(getElectricity.CancelManId))
|
||||
{
|
||||
this.txtCance.Text = UserService.GetUserNameByUserId(getElectricity.CancelManId) + "；取消时间："
|
||||
+ string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CancelTime) + "；原因：" + getElectricity.CancelReasons + "。";
|
||||
}
|
||||
if (!string.IsNullOrEmpty(getElectricity.CloseManId))
|
||||
{
|
||||
if (!string.IsNullOrEmpty(getElectricity.CloseReasons))
|
||||
{
|
||||
this.txtClose.Text = getElectricity.CloseReasons + " 关闭时间："
|
||||
+ string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime) + "。";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.txtClose.Text = UserService.GetUserNameByUserId(getElectricity.CloseManId) + "；关闭时间："
|
||||
+ string.Format("{0:yyyy-MM-dd HH:mm}", getElectricity.CloseTime) + "。";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// 绑定表格
|
||||
this.BindGrid();
|
||||
this.SetFlow();
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 获取审核记录信息
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
private void SetFlow()
|
||||
{
|
||||
var getFlows = LicensePublicService.GetFlowOperateListByDataId(this.ElectricityId);
|
||||
if (getFlows.Count() > 0)
|
||||
{
|
||||
var getF1 = getFlows.FirstOrDefault(x => x.SortIndex == 1);
|
||||
if (getF1 != null)
|
||||
{
|
||||
this.txtForm1.Title = getF1.AuditFlowName + "：";
|
||||
if (getF1.OperaterTime.HasValue)
|
||||
{
|
||||
if (getF1.IsAgree == true)
|
||||
{
|
||||
this.txtOpinion1.Text = "同意。";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.txtOpinion1.Text = getF1.Opinion;
|
||||
}
|
||||
this.txtName1.Text = UserService.GetUserNameByUserId(getF1.OperaterId);
|
||||
this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime);
|
||||
}
|
||||
}
|
||||
var getF2 = getFlows.FirstOrDefault(x => x.SortIndex == 2);
|
||||
if (getF2 != null)
|
||||
{
|
||||
this.txtForm2.Title = getF2.AuditFlowName + "：";
|
||||
if (getF2.OperaterTime.HasValue)
|
||||
{
|
||||
if (getF2.IsAgree == true)
|
||||
{
|
||||
this.txtOpinion2.Text = "同意。";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.txtOpinion2.Text = getF2.Opinion;
|
||||
}
|
||||
this.txtName2.Text = UserService.GetUserNameByUserId(getF2.OperaterId);
|
||||
this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime);
|
||||
}
|
||||
}
|
||||
var getF3 = getFlows.FirstOrDefault(x => x.SortIndex == 3);
|
||||
if (getF3 != null)
|
||||
{
|
||||
this.txtForm3.Title = getF3.AuditFlowName + "：";
|
||||
if (getF3.OperaterTime.HasValue)
|
||||
{
|
||||
if (getF3.IsAgree == true)
|
||||
{
|
||||
this.txtOpinion3.Text = "同意。";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.txtOpinion3.Text = getF3.Opinion;
|
||||
}
|
||||
this.txtName3.Text = UserService.GetUserNameByUserId(getF3.OperaterId);
|
||||
this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime);
|
||||
}
|
||||
}
|
||||
var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4);
|
||||
if (getF4 != null)
|
||||
{
|
||||
this.txtForm4.Title = getF4.AuditFlowName + "：";
|
||||
if (getF4.OperaterTime.HasValue)
|
||||
{
|
||||
if (getF4.IsAgree == true)
|
||||
{
|
||||
this.txtOpinion4.Text = "同意。";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.txtOpinion4.Text = getF4.Opinion;
|
||||
}
|
||||
this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId);
|
||||
this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime);
|
||||
}
|
||||
}
|
||||
var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5);
|
||||
if (getF5 != null)
|
||||
{
|
||||
this.txtForm5.Title = getF5.AuditFlowName + "：";
|
||||
if (getF5.OperaterTime.HasValue)
|
||||
{
|
||||
if (getF5.IsAgree == true)
|
||||
{
|
||||
this.txtOpinion5.Text = "同意。";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.txtOpinion5.Text = getF5.Opinion;
|
||||
}
|
||||
this.txtName5.Text = UserService.GetUserNameByUserId(getF5.OperaterId);
|
||||
this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime);
|
||||
}
|
||||
}
|
||||
var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6);
|
||||
if (getF6 != null)
|
||||
{
|
||||
this.txtForm6.Title = getF6.AuditFlowName + "：";
|
||||
if (getF6.OperaterTime.HasValue)
|
||||
{
|
||||
if (getF6.IsAgree == true)
|
||||
{
|
||||
this.txtOpinion6.Text = "同意。";
|
||||
}
|
||||
else
|
||||
{
|
||||
this.txtOpinion6.Text = getF6.Opinion;
|
||||
}
|
||||
this.txtName6.Text = UserService.GetUserNameByUserId(getF6.OperaterId);
|
||||
this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF6.OperaterTime);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
|
||||
/// <summary>
|
||||
/// 绑定数据
|
||||
/// </summary>
|
||||
private void BindGrid()
|
||||
{
|
||||
string strSql = @"SELECT LicenseItemId,DataId,SortIndex,SafetyMeasures,(CASE WHEN IsUsed = 1 THEN '适用' ELSE '不适用' END) AS NoUsedName,ConfirmManId,U.UserName AS ConfirmManName"
|
||||
+ @" FROM License_LicenseItem AS L "
|
||||
+ @" LEFT JOIN Sys_User AS U ON L.ConfirmManId =U.UserId"
|
||||
+ @" WHERE L.DataId ='" + this.ElectricityId + "'";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
Grid1.RecordCount = tb.Rows.Count;
|
||||
var table = this.GetPagedDataTable(Grid1, tb);
|
||||
Grid1.DataSource = table;
|
||||
Grid1.DataBind();
|
||||
}
|
||||
|
||||
#region 附件查看
|
||||
/// <summary>
|
||||
/// 附件查看
|
||||
/// </summary>
|
||||
/// <param name="sender"></param>
|
||||
/// <param name="e"></param>
|
||||
protected void btnAttachUrl_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(this.ElectricityId))
|
||||
{
|
||||
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&menuId={1}&type=-1", this.ElectricityId, Const.ProjectElectricityMenuId)));
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,467 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.HSSE.License
|
||||
{
|
||||
|
||||
|
||||
public partial class ElectricityView
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// SimpleForm1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form SimpleForm1;
|
||||
|
||||
/// <summary>
|
||||
/// lbLicenseCode 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbLicenseCode;
|
||||
|
||||
/// <summary>
|
||||
/// lbImageUrl 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbImageUrl;
|
||||
|
||||
/// <summary>
|
||||
/// txtApplyUnit 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtApplyUnit;
|
||||
|
||||
/// <summary>
|
||||
/// txtApplyManName 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtApplyManName;
|
||||
|
||||
/// <summary>
|
||||
/// txtWorkPalce 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWorkPalce;
|
||||
|
||||
/// <summary>
|
||||
/// txtReason 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtReason;
|
||||
|
||||
/// <summary>
|
||||
/// txtWorkDate 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWorkDate;
|
||||
|
||||
/// <summary>
|
||||
/// txtWorkMeasures 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtWorkMeasures;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
/// <summary>
|
||||
/// txtForm1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form txtForm1;
|
||||
|
||||
/// <summary>
|
||||
/// txtOpinion1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtOpinion1;
|
||||
|
||||
/// <summary>
|
||||
/// Label6 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label6;
|
||||
|
||||
/// <summary>
|
||||
/// txtName1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtName1;
|
||||
|
||||
/// <summary>
|
||||
/// txtTime1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtTime1;
|
||||
|
||||
/// <summary>
|
||||
/// txtForm2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form txtForm2;
|
||||
|
||||
/// <summary>
|
||||
/// txtOpinion2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtOpinion2;
|
||||
|
||||
/// <summary>
|
||||
/// Label1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label1;
|
||||
|
||||
/// <summary>
|
||||
/// txtName2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtName2;
|
||||
|
||||
/// <summary>
|
||||
/// txtTime2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtTime2;
|
||||
|
||||
/// <summary>
|
||||
/// txtForm3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form txtForm3;
|
||||
|
||||
/// <summary>
|
||||
/// txtOpinion3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtOpinion3;
|
||||
|
||||
/// <summary>
|
||||
/// Label2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label2;
|
||||
|
||||
/// <summary>
|
||||
/// txtName3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtName3;
|
||||
|
||||
/// <summary>
|
||||
/// txtTime3 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtTime3;
|
||||
|
||||
/// <summary>
|
||||
/// txtForm4 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form txtForm4;
|
||||
|
||||
/// <summary>
|
||||
/// txtOpinion4 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtOpinion4;
|
||||
|
||||
/// <summary>
|
||||
/// Label5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label5;
|
||||
|
||||
/// <summary>
|
||||
/// txtName4 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtName4;
|
||||
|
||||
/// <summary>
|
||||
/// txtTime4 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtTime4;
|
||||
|
||||
/// <summary>
|
||||
/// txtForm5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form txtForm5;
|
||||
|
||||
/// <summary>
|
||||
/// txtOpinion5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtOpinion5;
|
||||
|
||||
/// <summary>
|
||||
/// Label9 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label9;
|
||||
|
||||
/// <summary>
|
||||
/// txtName5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtName5;
|
||||
|
||||
/// <summary>
|
||||
/// txtTime5 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtTime5;
|
||||
|
||||
/// <summary>
|
||||
/// txtForm6 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Form txtForm6;
|
||||
|
||||
/// <summary>
|
||||
/// txtOpinion6 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextArea txtOpinion6;
|
||||
|
||||
/// <summary>
|
||||
/// Label12 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label Label12;
|
||||
|
||||
/// <summary>
|
||||
/// txtName6 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtName6;
|
||||
|
||||
/// <summary>
|
||||
/// txtTime6 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label txtTime6;
|
||||
|
||||
/// <summary>
|
||||
/// txtCance 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtCance;
|
||||
|
||||
/// <summary>
|
||||
/// txtClose 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.TextBox txtClose;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar1;
|
||||
|
||||
/// <summary>
|
||||
/// lbTemp 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Label lbTemp;
|
||||
|
||||
/// <summary>
|
||||
/// btnAttachUrl 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnAttachUrl;
|
||||
|
||||
/// <summary>
|
||||
/// ToolbarFill1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.ToolbarFill ToolbarFill1;
|
||||
|
||||
/// <summary>
|
||||
/// btnClose 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnClose;
|
||||
|
||||
/// <summary>
|
||||
/// WindowAtt 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Window WindowAtt;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,137 @@
|
|||
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="InspectionSummary.aspx.cs" Inherits="FineUIPro.Web.ZHGL.InspectionSummary.InspectionSummary" %>
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head runat="server">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<title>各项目巡查汇总</title>
|
||||
</head>
|
||||
<body>
|
||||
<form id="form1" runat="server">
|
||||
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" OnCustomEvent="PageManager1_CustomEvent" />
|
||||
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" ShowBorder="false" AutoScroll="true"
|
||||
ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
|
||||
<Items>
|
||||
<f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="各项目巡查汇总" EnableCollapse="false"
|
||||
runat="server" BoxFlex="1" DataKeyNames="InspectionSummaryId" AllowCellEditing="true"
|
||||
ClicksToEdit="2" DataIDField="InspectionSummaryId" AllowSorting="true" SortField="SortId"
|
||||
SortDirection="DESC" EnableColumnLines="true"
|
||||
AllowPaging="true" IsDatabasePaging="true" PageSize="10" IsFluid="true"
|
||||
EnableRowDoubleClickEvent="true" AllowColumnLocking="true">
|
||||
<Toolbars>
|
||||
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left">
|
||||
<Items>
|
||||
|
||||
<f:DatePicker runat="server" DateFormatString="yyyy-MM" EmptyText="请选择年月"
|
||||
ID="drpCompileDateMonth" DisplayType="Month" ShowTodayButton="false" >
|
||||
</f:DatePicker>
|
||||
|
||||
<f:Button ID="btnNew" ToolTip="生成" Hidden="false" Text="生成" Icon="Add" runat="server"
|
||||
OnClick="btnNew_Juge" OnClientClick="refresh();">
|
||||
</f:Button>
|
||||
|
||||
<%-- <f:Button ID="btnGenerate" ToolTip="生成" Hidden="true" Text="生成" Icon="Add" runat="server"
|
||||
OnClick="btnNew_Click" OnClientClick="refresh();">
|
||||
</f:Button>--%>
|
||||
|
||||
<f:Button ID="btnSearch" runat="server" Icon="SystemSearch" ToolTip="查询" OnClientClick="refresh();" OnClick="btnSearch_Click">
|
||||
</f:Button>
|
||||
|
||||
<f:Button ID="btnOut" OnClick="btnOut_Click" runat="server" Text="导出" ToolTip="导出" Icon="FolderUp"
|
||||
EnableAjax="false" DisableControlBeforePostBack="false" >
|
||||
</f:Button>
|
||||
|
||||
|
||||
|
||||
</Items>
|
||||
</f:Toolbar>
|
||||
</Toolbars>
|
||||
<Columns>
|
||||
<f:RenderField Width="100px" ColumnID="SNumber" DataField="SNumber" SortField="SNumber"
|
||||
FieldType="String" HeaderText="序号" TextAlign="Left" HeaderTextAlign="Center" ID="SNumber" ShowToolTip="true" Locked="true">
|
||||
</f:RenderField>
|
||||
|
||||
<f:RenderField Width="150px" ColumnID="ModuleName" DataField="ModuleName"
|
||||
FieldType="String" HeaderText="模块" TextAlign="Left" HeaderTextAlign="Center" Locked="true">
|
||||
</f:RenderField>
|
||||
|
||||
<f:GroupField Width="200px" HeaderText="功能菜单" TextAlign="Center" Locked="true">
|
||||
<Columns>
|
||||
<f:BoundField Width="100px" ColumnID="MenuP" DataField="MenuP" HeaderText="菜单" />
|
||||
<f:BoundField Width="100px" DataField="MenuC" ColumnID="MenuC" HeaderText="说明" />
|
||||
</Columns>
|
||||
</f:GroupField>
|
||||
|
||||
|
||||
<%-- <f:GroupField Width="200px" HeaderText="项目1" TextAlign="Center" BoxFlex="1" ExpandUnusedSpace="true" MinWidth="150px">
|
||||
<Columns>
|
||||
<f:BoundField Width="100px" DataField="1" HeaderText="12331" />
|
||||
</Columns>
|
||||
</f:GroupField>--%>
|
||||
</Columns>
|
||||
<Listeners>
|
||||
<f:Listener Event="dataload" Handler="onGridDataLoad" />
|
||||
</Listeners>
|
||||
|
||||
</f:Grid>
|
||||
</Items>
|
||||
</f:Panel>
|
||||
<%--<f:Window ID="Window1" runat="server" Hidden="true" ShowHeader="true"
|
||||
IsModal="true" Target="Parent" EnableMaximize="true" EnableResize="true" OnClose="Window1_Close"
|
||||
Title="编辑安全数据" EnableIFrame="true" Height="650px"
|
||||
Width="1200px">
|
||||
</f:Window>
|
||||
<f:Menu ID="Menu1" runat="server">
|
||||
<f:MenuButton ID="btnMenuEdit" OnClick="btnEdit_Click" EnablePostBack="true"
|
||||
Hidden="true" runat="server" Text="编辑" Icon="TableEdit" >
|
||||
</f:MenuButton>
|
||||
<f:MenuButton ID="btnMenuDelete" OnClick="btnDelete_Click" EnablePostBack="true" Icon="Delete"
|
||||
Hidden="true" ConfirmText="删除选中行？" ConfirmTarget="Parent" runat="server" Text="删除">
|
||||
</f:MenuButton>
|
||||
</f:Menu>--%>
|
||||
</form>
|
||||
<script type="text/javascript">
|
||||
<%-- var menuID = '<%= Menu1.ClientID %>';
|
||||
// 返回false，来阻止浏览器右键菜单
|
||||
function onRowContextMenu(event, rowId) {
|
||||
F(menuID).show(); //showAt(event.pageX, event.pageY);
|
||||
return false;
|
||||
}--%>
|
||||
|
||||
//生成操作
|
||||
function geneRate() {
|
||||
$('[id$="_btnGenerate"]').click();
|
||||
}
|
||||
|
||||
function reloadGrid() {
|
||||
__doPostBack(null, 'reloadGrid');
|
||||
}
|
||||
|
||||
$(function () {
|
||||
console.log($('[id$="_SNumber"]'))
|
||||
})
|
||||
|
||||
var Form1ClientID = '<%= Grid1.ClientID %>';
|
||||
|
||||
|
||||
function refresh() {
|
||||
var form1 = F(Form1ClientID);
|
||||
form1.showLoading();
|
||||
|
||||
}
|
||||
|
||||
function CloseRefresh() {
|
||||
var form1 = F(Form1ClientID);
|
||||
form1.hideLoading();
|
||||
|
||||
}
|
||||
|
||||
function onGridDataLoad(event) {
|
||||
this.mergeColumns(['SNumber']);
|
||||
this.mergeColumns(['ModuleName']);
|
||||
this.mergeColumns(['MenuP']);
|
||||
}
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
File diff suppressed because it is too large
Load Diff
107
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.designer.cs
generated
Normal file
107
SGGL/FineUIPro.Web/ZHGL/InspectionSummary/InspectionSummary.aspx.designer.cs
generated
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
//------------------------------------------------------------------------------
|
||||
// <自动生成>
|
||||
// 此代码由工具生成。
|
||||
//
|
||||
// 对此文件的更改可能导致不正确的行为，如果
|
||||
// 重新生成代码，则所做更改将丢失。
|
||||
// </自动生成>
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
namespace FineUIPro.Web.ZHGL.InspectionSummary
|
||||
{
|
||||
|
||||
|
||||
public partial class InspectionSummary
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// form1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
|
||||
|
||||
/// <summary>
|
||||
/// PageManager1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.PageManager PageManager1;
|
||||
|
||||
/// <summary>
|
||||
/// Panel1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Panel Panel1;
|
||||
|
||||
/// <summary>
|
||||
/// Grid1 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Grid Grid1;
|
||||
|
||||
/// <summary>
|
||||
/// Toolbar2 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Toolbar Toolbar2;
|
||||
|
||||
/// <summary>
|
||||
/// drpCompileDateMonth 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.DatePicker drpCompileDateMonth;
|
||||
|
||||
/// <summary>
|
||||
/// btnNew 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnNew;
|
||||
|
||||
/// <summary>
|
||||
/// btnSearch 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnSearch;
|
||||
|
||||
/// <summary>
|
||||
/// btnOut 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.Button btnOut;
|
||||
|
||||
/// <summary>
|
||||
/// SNumber 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::FineUIPro.RenderField SNumber;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -28,6 +28,7 @@ namespace FineUIPro.Web.common
|
|||
{
|
||||
ViewState["ProjectId"] = value;
|
||||
}
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 页面加载
|
||||
|
|
@ -41,14 +42,14 @@ namespace FineUIPro.Web.common
|
|||
ProjectId = CurrUser.LoginProjectId;
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
//安全人工时
|
||||
int wHours = db.SitePerson_PersonInOutNumber.Where(x=> x.ProjectId == ProjectId).Max(x => x.WorkHours ) ?? 0;
|
||||
int wHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == ProjectId).Max(x => x.WorkHours) ?? 0;
|
||||
this.divSafeWorkTime.InnerHtml = wHours.ToString();
|
||||
|
||||
//本月安全人工时
|
||||
int wHoursMonth = 0;
|
||||
DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString()+"-"+ DateTime.Now.Month.ToString());
|
||||
DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
|
||||
var dayReports = BLL.SitePerson_MonthReportService.getMonthReports(this.ProjectId, sDate);
|
||||
if (dayReports.Count>0)
|
||||
if (dayReports.Count > 0)
|
||||
{
|
||||
wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime);
|
||||
}
|
||||
|
|
@ -60,11 +61,11 @@ namespace FineUIPro.Web.common
|
|||
|
||||
//安全管理人员
|
||||
var allSum = from x in Funs.DB.SitePerson_Person
|
||||
where x.IsUsed == true && x.ProjectId==ProjectId
|
||||
where x.IsUsed == true && x.ProjectId == ProjectId
|
||||
select x;
|
||||
var glAllPerson = from x in allSum
|
||||
join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
|
||||
where (y.PostType == "1" || y.PostType == "4") && x.ProjectId==ProjectId //一般管理岗位和特种管理人员
|
||||
where (y.PostType == "1" || y.PostType == "4") && x.ProjectId == ProjectId //一般管理岗位和特种管理人员
|
||||
select x;
|
||||
this.divSafeManagePersonNum.InnerHtml = glAllPerson.Count().ToString();
|
||||
|
||||
|
|
@ -97,7 +98,7 @@ namespace FineUIPro.Web.common
|
|||
|
||||
//施工审批量
|
||||
int sgspl = Funs.DB.Solution_CQMSConstructSolution.Where(x => x.ProjectId == ProjectId && x.State == "1").Count();
|
||||
div_sgfaSpl.InnerHtml = sgspl.ToString() ;
|
||||
div_sgfaSpl.InnerHtml = sgspl.ToString();
|
||||
|
||||
//质量共检
|
||||
getZlgj();
|
||||
|
|
@ -115,6 +116,7 @@ namespace FineUIPro.Web.common
|
|||
getProjectSitePerson();
|
||||
|
||||
//工作台面
|
||||
getGjsx();
|
||||
getGztm();
|
||||
|
||||
//材料到货
|
||||
|
|
@ -127,7 +129,7 @@ namespace FineUIPro.Web.common
|
|||
{
|
||||
int AllCount = 0;
|
||||
int MCount = 0;
|
||||
var getallin = APIPageDataService.getPersonNum(ProjectId,DateTime.Now);
|
||||
var getallin = APIPageDataService.getPersonNum(ProjectId, DateTime.Now);
|
||||
AllCount = getallin.Count();
|
||||
if (AllCount > 0)
|
||||
{
|
||||
|
|
@ -152,13 +154,13 @@ namespace FineUIPro.Web.common
|
|||
private void getProjectSitePerson()
|
||||
{
|
||||
var list = Funs.DB.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null) && x.Progress != null
|
||||
&& x.ProjectId==ProjectId).ToList();
|
||||
&& x.ProjectId == ProjectId).ToList();
|
||||
foreach (var item in list)
|
||||
{
|
||||
ProjectPersonMc += "'" + item.ShortName + "',";
|
||||
ProjectPersonCount += "'" + APIPageDataService.getPersonNum(item.ProjectId, DateTime.Now).Count() + "',";
|
||||
}
|
||||
if (!string.IsNullOrEmpty(ProjectPersonMc)&& !string.IsNullOrEmpty(ProjectPersonCount))
|
||||
if (!string.IsNullOrEmpty(ProjectPersonMc) && !string.IsNullOrEmpty(ProjectPersonCount))
|
||||
{
|
||||
ProjectPersonMc = ProjectPersonMc.TrimEnd(',');
|
||||
ProjectPersonCount = ProjectPersonCount.TrimEnd(',');
|
||||
|
|
@ -179,7 +181,7 @@ namespace FineUIPro.Web.common
|
|||
/// 获取隐患整改闭环项
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public int GetGeneralClosedNum()
|
||||
public int GetGeneralClosedNum()
|
||||
{
|
||||
int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.States == "3" && x.ProjectId == ProjectId
|
||||
|
|
@ -190,7 +192,7 @@ namespace FineUIPro.Web.common
|
|||
/// 获取隐患未整改完成项
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public int GetGeneralNotClosedNum()
|
||||
public int GetGeneralNotClosedNum()
|
||||
{
|
||||
int result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||
where x.States != "3" && x.ProjectId == ProjectId
|
||||
|
|
@ -230,7 +232,7 @@ namespace FineUIPro.Web.common
|
|||
if (project != null)
|
||||
{
|
||||
spanProjectName = "<span title='" + project.ShortName + "'>" + project.ShortName + "</span>";
|
||||
spanRemark= "<span title='" + project.Remark + "'>" + project.Remark + "</span>";
|
||||
spanRemark = "<span title='" + project.Remark + "'>" + project.Remark + "</span>";
|
||||
divProjectNameTitle = project.ProjectName;
|
||||
if (!string.IsNullOrEmpty(project.ProjectAddress))
|
||||
{
|
||||
|
|
@ -345,7 +347,7 @@ namespace FineUIPro.Web.common
|
|||
int allCount = 0;
|
||||
var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
|
||||
join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
|
||||
where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.ProjectId==ProjectId
|
||||
where x.LimitDate.HasValue && x.LimitDate < DateTime.Now && y.ProjectId == ProjectId
|
||||
select x;
|
||||
//// 预警人数
|
||||
allCount = getPersonQualitys.Count();
|
||||
|
|
@ -356,12 +358,12 @@ namespace FineUIPro.Web.common
|
|||
/// 机械预警
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
protected int GetJxyjNum()
|
||||
protected int GetJxyjNum()
|
||||
{
|
||||
int result = 0;
|
||||
//机具报验的到期提醒和过期提醒记录数加一起
|
||||
//机具报验的到期提醒数
|
||||
var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId==ProjectId
|
||||
var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate && x.ProjectId == ProjectId
|
||||
&& ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
|
||||
//过期提醒记录数
|
||||
var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now && x.ProjectId == ProjectId).Count();
|
||||
|
|
@ -455,8 +457,9 @@ namespace FineUIPro.Web.common
|
|||
/// 动火作业许可证
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
protected int getWrokCount0() {
|
||||
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId&&x.LicenseTypeName== "动火作业许可证").ToList().Count;
|
||||
protected int getWrokCount0()
|
||||
{
|
||||
var result = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId && x.LicenseTypeName == "动火作业许可证").ToList().Count;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -492,7 +495,7 @@ namespace FineUIPro.Web.common
|
|||
protected void getZlwt()
|
||||
{
|
||||
zlallNumber = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now && x.ProjectId==ProjectId
|
||||
where x.CheckDate <= DateTime.Now && x.ProjectId == ProjectId
|
||||
select x).Count().ToString();
|
||||
var num2 = (from x in Funs.DB.Check_CheckControl
|
||||
where x.CheckDate <= DateTime.Now && x.State == "7" && x.ProjectId == ProjectId
|
||||
|
|
@ -536,12 +539,13 @@ namespace FineUIPro.Web.common
|
|||
zlgjzgl = zgl.ToString();
|
||||
zggjzglDataValue = (100 - (100.0 * num2 / (num2 + num3))).ToString();
|
||||
}
|
||||
else {
|
||||
else
|
||||
{
|
||||
zlgjzgl = zgl.ToString();
|
||||
zggjzglDataValue = "0";
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
|
@ -565,7 +569,7 @@ namespace FineUIPro.Web.common
|
|||
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
|
||||
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
|
||||
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null
|
||||
&& a.ProjectId ==ProjectId
|
||||
&& a.ProjectId == ProjectId
|
||||
select x.NDEItemID).Count();
|
||||
//一次检测返修焊口数
|
||||
int oneCheckRepairJotNum = (from x in db.HJGL_Batch_NDEItem
|
||||
|
|
@ -573,7 +577,7 @@ namespace FineUIPro.Web.common
|
|||
join z in db.HJGL_Batch_PointBatchItem on y.PointBatchItemId equals z.PointBatchItemId
|
||||
join a in db.HJGL_Batch_NDE on x.NDEID equals a.NDEID
|
||||
where z.PointDate != null && z.PointState == "1" && y.RepairRecordId == null && x.CheckResult == "2"
|
||||
&& a.ProjectId ==ProjectId
|
||||
&& a.ProjectId == ProjectId
|
||||
select x.NDEItemID).Count();
|
||||
if (oneCheckJotNum > 0)
|
||||
{
|
||||
|
|
@ -799,29 +803,35 @@ namespace FineUIPro.Web.common
|
|||
#endregion
|
||||
|
||||
#region 作业许可列表
|
||||
protected string getLicenseManager() {
|
||||
protected string getLicenseManager()
|
||||
{
|
||||
string returnHtml = "";
|
||||
var list = Funs.DB.View_License_LicenseManager.Where(x => x.ProjectId == ProjectId).ToList();
|
||||
foreach (var item in list)
|
||||
{
|
||||
var gfx = "风险作业";
|
||||
if (item.IsHighRisk!=true)
|
||||
if (item.IsHighRisk != true)
|
||||
{
|
||||
gfx = "非高风险";
|
||||
}
|
||||
var shortUnitname = Funs.DB.Base_Unit.Where(x => x.UnitId == item.UnitId).FirstOrDefault().ShortUnitName;
|
||||
returnHtml+= "<div class=\"li\">"+item.LicenseManagerCode+"-"+shortUnitname + "-"+item.WorkAreaName+"-"+ gfx+"-"+item.LicenseTypeName
|
||||
+"</div>";
|
||||
returnHtml += "<div class=\"li\">" + item.LicenseManagerCode + "-" + shortUnitname + "-" + item.WorkAreaName + "-" + gfx + "-" + item.LicenseTypeName
|
||||
+ "</div>";
|
||||
}
|
||||
return returnHtml;
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 工作台面
|
||||
protected void getGztm() {
|
||||
div_dbsxlist.InnerHtml = "";
|
||||
//关键事项
|
||||
string strSql = @"SELECT GJSXID AS DataId
|
||||
|
||||
protected void getGztm()
|
||||
{
|
||||
//div_dbsxlist.InnerHtml = "";
|
||||
string returnDbHtml = "<div></div>";
|
||||
if (!string.IsNullOrEmpty(ProjectId))
|
||||
{
|
||||
//关键事项
|
||||
string strSql = @"SELECT GJSXID AS DataId
|
||||
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
|
||||
,'关键事项待处理' AS MenuName
|
||||
,GJSX.Detail AS Content
|
||||
|
|
@ -837,26 +847,80 @@ namespace FineUIPro.Web.common
|
|||
and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
|
||||
or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
|
||||
)";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
||||
listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
|
||||
listStr.Add(new SqlParameter("@projectId", ProjectId));
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
var Gjsxcount = tb.Rows.Count;
|
||||
div_gjsx.InnerHtml = Gjsxcount.ToString() ;
|
||||
listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
|
||||
listStr.Add(new SqlParameter("@projectId", ProjectId));
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
var Gjsxcount = tb.Rows.Count;
|
||||
div_gjsx.InnerHtml = Gjsxcount.ToString();
|
||||
|
||||
var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList();
|
||||
//待办事项、个人流程
|
||||
div_dbsx.InnerHtml= getDataList.Count().ToString();
|
||||
div_grlc.InnerHtml = getDataList.Count().ToString();
|
||||
string returnHtml = "";
|
||||
foreach (var item in getDataList)
|
||||
{
|
||||
returnHtml += "<div class=\"li\" style='cursor:pointer' onclick=\"returnWindows('" + item.PCUrl + "')\"><span>"+ item.MenuName + "</span><span>" + item.Content+"</span><span>"+
|
||||
item.DataTime.ToString().Replace('/','-').Split(' ')[0] + "</span></div>";
|
||||
var getDataList = Funs.DB.Sp_Project_GetToDoItems(this.CurrUser.LoginProjectId, this.CurrUser.UserId).ToList();
|
||||
//待办事项、个人流程
|
||||
div_dbsx.InnerHtml = getDataList.Count().ToString();
|
||||
div_grlc.InnerHtml = getDataList.Count().ToString();
|
||||
foreach (var item in getDataList)
|
||||
{
|
||||
returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\" onclick=\"returnWindows(\"" + item.PCUrl + "\")\"><span>" + item.MenuName + "</span><span>" + item.Content + "</span><span>" +
|
||||
item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
|
||||
}
|
||||
}
|
||||
div_dbsxlist.InnerHtml = returnHtml;
|
||||
else {
|
||||
returnDbHtml = "<div></div>";
|
||||
}
|
||||
this.div_dbsxlist.InnerHtml = returnDbHtml;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 加载关键事项
|
||||
/// </summary>
|
||||
protected void getGjsx()
|
||||
{
|
||||
string returnDbHtml = "<div></div>";
|
||||
////关键事项
|
||||
if (!string.IsNullOrEmpty(ProjectId))
|
||||
{
|
||||
string strSql = @"SELECT GJSXID AS DataId
|
||||
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
|
||||
,'关键事项待处理' AS MenuName
|
||||
,GJSX.Detail AS Content
|
||||
,users.UserId
|
||||
,users.UserName
|
||||
,GJSX.CreateDate AS DataTime
|
||||
,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr
|
||||
,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl
|
||||
FROM GJSX
|
||||
LEFT JOIN Sys_User AS users ON users.UserId =@userId
|
||||
WHERE GJSX.ProjectId=@projectId AND
|
||||
GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId and detail.GJSXID=GJSX.GJSXID)=0
|
||||
and (select count(*) from GJSX_Process process where process.UserId=@userId and process.GJSXID=GJSX.GJSXID)>0)
|
||||
or (GJSX.User_Acceptance like '%'+@userId+'%' and (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID))
|
||||
)";
|
||||
List<SqlParameter> listStr = new List<SqlParameter>();
|
||||
|
||||
listStr.Add(new SqlParameter("@userId", CurrUser.UserId));
|
||||
listStr.Add(new SqlParameter("@projectId", ProjectId));
|
||||
SqlParameter[] parameter = listStr.ToArray();
|
||||
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
|
||||
|
||||
for (int i = 0; i < tb.Rows.Count; i++)
|
||||
{
|
||||
returnDbHtml += "<div class=\"li\" style=\"cursor:pointer\" " +
|
||||
"onclick=\"returnWindows(\"" + tb.Rows[i]["PCUrl"] + "\")\"><span>" + tb.Rows[i]["MenuName"] + "</span><span>" + tb.Rows[i]["Content"] + "</span><span>" +
|
||||
tb.Rows[i]["DataTime"].ToString().Replace('/', '-').Split(' ')[0] + "</span></div>";
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
returnDbHtml = "<div></div>";
|
||||
}
|
||||
this.div_gjsxlist.InnerHtml = returnDbHtml;
|
||||
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
|
|
@ -868,9 +932,10 @@ namespace FineUIPro.Web.common
|
|||
protected void Window1_Close(object sender, WindowCloseEventArgs e)
|
||||
{
|
||||
getGztm();
|
||||
getGjsx();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 打开待办
|
||||
/// </summary>
|
||||
|
|
@ -895,23 +960,23 @@ namespace FineUIPro.Web.common
|
|||
{
|
||||
//管道材料
|
||||
var pid = BLL.ProjectService.GetCLProjectCodeByProjectId(ProjectId).ToString();
|
||||
var list = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M" && x.ProjectId== pid);
|
||||
var list = Funs.DB.CLGL_PipelineMaterialSumList.Where(x => x.Type == "M" && x.ProjectId == pid);
|
||||
foreach (var item in list)
|
||||
{
|
||||
gdclHtml += "<div class=\"tr\">";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">"+item.C1+"</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .8375rem; \">" + (string.IsNullOrEmpty(item.C2)?"0": item.C2) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + item.C1 + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .8375rem; \">" + (string.IsNullOrEmpty(item.C2) ? "0" : item.C2) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C4) ? "0" : item.C4) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C5) ? "0%" : item.C5) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C6)?"0": item.C6) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C7)?"0%": item.C7) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C8)?"0": item.C8) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C6) ? "0" : item.C6) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C7) ? "0%" : item.C7) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C8) ? "0" : item.C8) + "</span>";
|
||||
gdclHtml += "<span class=\"r-line\" style=\"width: .7875rem; \">" + (string.IsNullOrEmpty(item.C9) ? "0%" : item.C9) + "</span>";
|
||||
gdclHtml += "</div>";
|
||||
}
|
||||
|
||||
//设备材料
|
||||
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备"&&x.ProjectId==pid);
|
||||
var SbclList = Funs.DB.CLGL_ContractListSum.Where(x => x.C1 == "设备" && x.ProjectId == pid);
|
||||
foreach (var item in SbclList)
|
||||
{
|
||||
sbclHtml += "<div class=\"tr\">";
|
||||
|
|
@ -935,8 +1000,8 @@ namespace FineUIPro.Web.common
|
|||
var dhbfb = "0%";
|
||||
if (SbcllCgl + Sbdhs != 0)
|
||||
{
|
||||
dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
|
||||
|
||||
dhbfb = String.Format("{0:N2}", 100.0 * Sbdhs / (Sbdhs + SbcllCgl), 2) + "%";
|
||||
|
||||
}
|
||||
sbclHtml += "<span class=\"r-line\" style=\"width: .9875rem; \">" + dhbfb + "</span>";
|
||||
sbclHtml += "</div>";
|
||||
|
|
|
|||
|
|
@ -158,6 +158,15 @@ namespace FineUIPro.Web.common
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_sgfaSpl;
|
||||
|
||||
/// <summary>
|
||||
/// div_Gzgjsx 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgjsx;
|
||||
|
||||
/// <summary>
|
||||
/// div_gjsx 控件。
|
||||
/// </summary>
|
||||
|
|
@ -167,6 +176,15 @@ namespace FineUIPro.Web.common
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsx;
|
||||
|
||||
/// <summary>
|
||||
/// div_Gzdbsx 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzdbsx;
|
||||
|
||||
/// <summary>
|
||||
/// div_dbsx 控件。
|
||||
/// </summary>
|
||||
|
|
@ -176,6 +194,15 @@ namespace FineUIPro.Web.common
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_dbsx;
|
||||
|
||||
/// <summary>
|
||||
/// div_Gzgrlc 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_Gzgrlc;
|
||||
|
||||
/// <summary>
|
||||
/// div_grlc 控件。
|
||||
/// </summary>
|
||||
|
|
@ -194,6 +221,15 @@ namespace FineUIPro.Web.common
|
|||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_ybrw;
|
||||
|
||||
/// <summary>
|
||||
/// div_gjsxlist 控件。
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// 自动生成的字段。
|
||||
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.HtmlControls.HtmlGenericControl div_gjsxlist;
|
||||
|
||||
/// <summary>
|
||||
/// div_dbsxlist 控件。
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -692,6 +692,11 @@
|
|||
}
|
||||
|
||||
F.ready(function () {
|
||||
$(".y_row div").click(function () {
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
});
|
||||
|
||||
$(".item-s li").click(function () {
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
|
|
|
|||
|
|
@ -466,65 +466,89 @@
|
|||
|
||||
function ProjectTGClick() {
|
||||
F(ProjectTGClientID).click();
|
||||
|
||||
}
|
||||
|
||||
function ProjectJGClick() {
|
||||
F(ProjectJGClientID).click();
|
||||
|
||||
}
|
||||
|
||||
function CQMSClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnCQMSClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function HSSEClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnHSSEClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function JDGLClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnJDGLClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function HJGLClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnHJGLClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function CLGLClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnCLGLClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function TestRunClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnTestRunClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function PGJSXClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnPGJSXClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function DigitalSiteClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnDigitalSiteClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function PDigDataClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnPDigDataClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function OpinionClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnOpinionClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
function DocClick() {
|
||||
parent.removeActiveTab();
|
||||
F(btnDocClientID).click();
|
||||
F(btnDocClientID).click();
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
}
|
||||
|
||||
// 展开左侧面板
|
||||
|
|
@ -800,6 +824,15 @@
|
|||
}
|
||||
|
||||
F.ready(function () {
|
||||
$(".y_row div").click(function () {
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
});
|
||||
|
||||
$(".up-wrap-ul").click(function () {
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
});
|
||||
$(".up-wrap-ul").click(function () {
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
|
|
@ -809,7 +842,11 @@
|
|||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:block !important;")
|
||||
});
|
||||
|
||||
$(".y_title").click(function () {
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:none !important;")
|
||||
$(".bgbtn,.bgbtntop").removeClass("activeClick")
|
||||
});
|
||||
$(".item-pbig").click(function () {
|
||||
var $item = $('.f-tabstrip-header')
|
||||
$item.attr('style', ";display:none !important;")
|
||||
|
|
|
|||
|
|
@ -187,5 +187,21 @@ namespace Model
|
|||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检查要点Id
|
||||
/// </summary>
|
||||
public string CheckItemDetailSetId { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 检查要点内容
|
||||
/// </summary>
|
||||
public string CheckItemDetailContent { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 整改期限
|
||||
/// </summary>
|
||||
public string Rectification_Date { get; set; }
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -277,7 +277,7 @@ namespace Model
|
|||
set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 作业负责人名字（射线、夜间）
|
||||
/// 作业负责人名字（射线、夜间、高处）
|
||||
/// </summary>
|
||||
public string WorkLeaderName
|
||||
{
|
||||
|
|
@ -285,7 +285,7 @@ namespace Model
|
|||
set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 作业负责人电话（射线、夜间）
|
||||
/// 作业负责人电话（射线、夜间、高处）
|
||||
/// </summary>
|
||||
public string WorkLeaderTel
|
||||
{
|
||||
|
|
@ -389,5 +389,114 @@ namespace Model
|
|||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
//新增
|
||||
public string WorkAreaName
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 区域
|
||||
/// </summary>
|
||||
public string WorkAreaId
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 原因
|
||||
/// </summary>
|
||||
public string Reason
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 动火作业级别
|
||||
/// </summary>
|
||||
public string FireLevel
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 空间内介质描述
|
||||
/// </summary>
|
||||
public string LimitedDescribe
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 是否存在其它介质
|
||||
/// </summary>
|
||||
public bool? IsBoolOther
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 作业是否耗氧或产生其它有毒有害气体
|
||||
/// </summary>
|
||||
public bool? IsBoolHarmfulGas
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 氧含量测试结果
|
||||
/// </summary>
|
||||
public string TestResult
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 测试时间
|
||||
/// </summary>
|
||||
public string TestDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 测试人
|
||||
/// </summary>
|
||||
public string TestPerson { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 通风措施
|
||||
/// </summary>
|
||||
public string VenStep { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 作业点高度
|
||||
/// </summary>
|
||||
public string WorkHeight { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 高处作业级别
|
||||
/// </summary>
|
||||
public string HeightLevel { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 吊装高度
|
||||
/// </summary>
|
||||
public string LiftingHeight { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起重工姓名
|
||||
/// </summary>
|
||||
public string QzgName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 起重工电话
|
||||
/// </summary>
|
||||
public string QzgPhone { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,159 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
|
||||
namespace Model
|
||||
{
|
||||
/// <summary>
|
||||
/// 隐患整改单统计
|
||||
/// </summary>
|
||||
public class RecityNoticesItem
|
||||
{
|
||||
/// <summary>
|
||||
/// ID
|
||||
/// </summary>
|
||||
public string DataId
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 类型
|
||||
/// </summary>
|
||||
public string Type
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
public string DataName
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 项目名称
|
||||
/// </summary>
|
||||
public string DataAllName
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 安全巡检隐患总数
|
||||
/// </summary>
|
||||
public int DataSumCount1
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 安全巡检隐患待整改数
|
||||
/// </summary>
|
||||
public int DataSumCountDzg1
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 安全巡检隐患已整改数
|
||||
/// </summary>
|
||||
public int DataSumCountYzg1
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public string DataSumCountZgl1 { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 常规巡检隐患总数
|
||||
/// </summary>
|
||||
public int DataSumCount2
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 常规巡检隐患待整改数
|
||||
/// </summary>
|
||||
public int DataSumCountDzg2
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 常规巡检隐患已整改数
|
||||
/// </summary>
|
||||
public int DataSumCountYzg2
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public string DataSumCountZgl2 { get; set; }
|
||||
/// <summary>
|
||||
/// 专项检查隐患总数
|
||||
/// </summary>
|
||||
public int DataSumCount3
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 专项检查隐患待整改数
|
||||
/// </summary>
|
||||
public int DataSumCountDzg3
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 专项检查隐患已整改数
|
||||
/// </summary>
|
||||
public int DataSumCountYzg3
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
public string DataSumCountZgl3 { get; set; }
|
||||
/// <summary>
|
||||
/// 综合检查隐患总数
|
||||
/// </summary>
|
||||
public int DataSumCount4
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 综合检查隐患待整改数
|
||||
/// </summary>
|
||||
public int DataSumCountDzg4
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 综合检查隐患已整改数
|
||||
/// </summary>
|
||||
public int DataSumCountYzg4
|
||||
{
|
||||
get;
|
||||
set;
|
||||
}
|
||||
|
||||
public string DataSumCountZgl4 { get; set; }
|
||||
}
|
||||
}
|
||||
2250
SGGL/Model/Model.cs
2250
SGGL/Model/Model.cs
File diff suppressed because it is too large
Load Diff
|
|
@ -105,6 +105,7 @@
|
|||
<Compile Include="APIItem\HSSE\PersonItem.cs" />
|
||||
<Compile Include="APIItem\HSSE\PersonQualityItem.cs" />
|
||||
<Compile Include="APIItem\HSSE\PictureItem.cs" />
|
||||
<Compile Include="APIItem\HSSE\RecityNoticesItem.cs" />
|
||||
<Compile Include="APIItem\HSSE\SeDinMonthReport4OtherItem.cs" />
|
||||
<Compile Include="APIItem\OperationReportDto.cs" />
|
||||
<Compile Include="APIItem\ProjectGpsPointItem.cs" />
|
||||
|
|
|
|||
|
|
@ -122,19 +122,37 @@ namespace WebAPI.Controllers
|
|||
public Model.ReturnData PostGetHSSEData()
|
||||
{
|
||||
var returnData = new Model.ReturnData();
|
||||
returnData.type = "HSSE";
|
||||
returnData.time = DateTime.Now.ToString();
|
||||
ServerService.GetToken();
|
||||
returnData.token = BLL.SysConstSetService.CNCECToken;
|
||||
returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime;
|
||||
if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now)
|
||||
try
|
||||
{
|
||||
returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE();
|
||||
returnData.type = "HSSE";
|
||||
returnData.time = DateTime.Now.ToString();
|
||||
ServerService.GetToken();
|
||||
returnData.token = BLL.SysConstSetService.CNCECToken;
|
||||
returnData.expiryTime = BLL.SysConstSetService.CNCECTTokenExTime;
|
||||
if (!string.IsNullOrEmpty(returnData.token) && !string.IsNullOrEmpty(returnData.expiryTime) && DateTime.Parse(returnData.expiryTime) > DateTime.Now)
|
||||
{
|
||||
returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE();
|
||||
}
|
||||
else
|
||||
{
|
||||
returnData.code = 500;
|
||||
returnData.message = "token失效";
|
||||
}
|
||||
}
|
||||
else
|
||||
catch (Exception ex)
|
||||
{
|
||||
returnData.code = 500;
|
||||
returnData.message = "token失效";
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
Model.Sys_Log syslog = new Model.Sys_Log
|
||||
{
|
||||
LogId = SQLHelper.GetNewID(),
|
||||
OperationTime = DateTime.Now,
|
||||
OperationLog = ex.Message,
|
||||
LogSource = 1,
|
||||
};
|
||||
db.Sys_Log.InsertOnSubmit(syslog);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
return returnData;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="Aspose.Words">
|
||||
<HintPath>..\FineUIPro.Web\bin\Aspose.Words.dll</HintPath>
|
||||
<HintPath>..\FineUIPro\Reference BLL\Aspose.Words.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Microsoft.CSharp" />
|
||||
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
|
||||
|
|
|
|||
Loading…
Reference in New Issue