lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

This commit is contained in:
李鹏飞 2025-04-25 15:12:47 +08:00
parent c56aac02e1 6bebbe15ef
commit 107c213aa7
75 changed files with 4391 additions and 1430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -55,3 +55,4 @@
/SGGL/FineUIPro.Web/FileUpload/Gjsx/2025-03
/SGGLPackFile2
/SGGL/FineUIPro.Web/upload
/SGGL/FineUIPro.Web/FileUpload/PersonBaseInfo/2025-4

370
DataBase/版本日志/SGGLDB_WH_2025-04-01-bwj.sql Normal file
View File

@ -0,0 +1,370 @@
--获取当前人工作台待办预警
ALTER PROCEDURE [dbo].[Sp_WorkBench_GetToDoItems]
@userId NVARCHAR(200)=NULL,
@sType char(10)=null
AS
/*获取当前人待办事项*/
BEGIN
SELECT HazardRegisterId AS DataId
,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
,'安全巡检待整改' AS MenuName
,project.ProjectCode
,register.RegisterDef AS Content
,users.UserId
,users.UserName
,register.RegisterDate AS DataTime
,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
,'HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
FROM HSSE_Hazard_HazardRegister AS register
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE (@sType='1' or @sType='2') and register.ProjectId = projectUser.ProjectId and
((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') ))
)
UNION ALL
SELECT HazardRegisterId AS DataId
,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
,'安全巡检待确认' AS MenuName
,project.ProjectCode
,register.RegisterDef AS Content
,users.UserId
,users.UserName
,register.RegisterDate AS DataTime
,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
,'HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
FROM HSSE_Hazard_HazardRegister AS register
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE (@sType='1' or @sType='2') and register.ProjectId = projectUser.ProjectId and
register.states = '2' AND register.CheckManId =@userId
UNION ALL
SELECT CheckControlCode AS DataId
,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
,'质量巡检待处理' AS MenuName
,project.ProjectCode
,checkControl.QuestionDef AS Content
,users.UserId
,users.UserName
,checkControl.CheckDate AS DataTime
,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr
,'CQMS/Check/ChecklistEdit.aspx?CheckControlCode='+checkControl.CheckControlCode AS PCUrl
FROM Check_CheckControl AS checkControl
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE (@sType='1' or @sType='2') and checkControl.ProjectId = projectUser.ProjectId and
checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
UNION ALL
SELECT GJSXID AS DataId
,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId
,'关键事项待处理' AS MenuName
,project.ProjectCode
,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 Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE (@sType='1' or @sType='2') and GJSX.ProjectId = projectUser.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))
)
UNION ALL
SELECT ConstructSolutionId AS DataId
,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId
,'施工方案待处理' AS MenuName
,project.ProjectCode
,Solution.SolutionName AS Content
,users.UserId
,users.UserName
,Solution.CompileDate AS DataTime
,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr
,'CQMS/Solution/EditConstructSolution.aspx?ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl
FROM Solution_CQMSConstructSolution AS Solution
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE (@sType='1' or @sType='2') and Solution.ProjectId = projectUser.ProjectId and
Solution.State!='3'
AND Solution.ConstructSolutionId in
(select top 1 ConstructSolutionId from (
SELECT Solution_CQMSConstructSolutionApprove.*
FROM Solution_CQMSConstructSolutionApprove,
(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and ApproveDate is null GROUP BY ConstructSolutionId )b
WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId
) approve
where approve.ApproveMan=@userId )
UNION ALL
SELECT InspectionId AS DataId
,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId
,'共检通知单待处理' AS MenuName
,project.ProjectCode
,InspectionManagement.AcceptanceSite AS Content
,users.UserId
,users.UserName
,InspectionManagement.CompileDate AS DataTime
,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr
,'CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl
FROM ProcessControl_InspectionManagement AS InspectionManagement
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE (@sType='1' or @sType='2') and InspectionManagement.ProjectId=projectUser.ProjectId and
dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%'
UNION ALL
SELECT CheckSpecialId AS DataId
,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId
,'专项检查' AS MenuName
,project.ProjectCode
,CheckItemSet.CheckItemName AS Content
,users.UserId
,users.UserName
,CheckSpecial.CheckTime AS DataTime
,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr
,'HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl
FROM Check_CheckSpecial AS CheckSpecial
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId
WHERE (@sType='1' or @sType='2') and
dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%'
and CheckSpecial.ProjectId = projectUser.ProjectId
UNION ALL
SELECT CheckColligationId AS DataId
,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId
,'综合检查待处理' AS MenuName
,project.ProjectCode
,case CheckType when '0' then '周检' when '1' then '月检' else '其它' end AS Content
,users.UserId
,users.UserName
,CheckColligation.CheckTime AS DataTime
,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr
,'HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl
FROM Check_CheckColligation AS CheckColligation
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId
LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId
WHERE (@sType='1' or @sType='2') and
FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId
and CheckColligation.ProjectId = projectUser.ProjectId
UNION ALL
SELECT PatrolPlanId AS DataId
,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId
,'风险巡检待处理' AS MenuName
,project.ProjectCode
,HazardListItem.HazardItems AS Content
,users.UserId
,users.UserName
,PatrolPlan.LimitCheckDate AS DataTime
,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr
,'HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl
FROM Hazard_PatrolPlan AS PatrolPlan
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId
WHERE (@sType='1' or @sType='2') and
dateadd(day,-3,PatrolPlan.LimitCheckDate)<getdate() and PatrolPlan.DutyPerson=@userId
and (select COUNT(*) from Hazard_RoutingInspection ri where ri.PatrolPlanId=PatrolPlan.PatrolPlanId)=0
and HazardListItem.ProjectId=projectUser.ProjectId
UNION ALL
SELECT PersonQuality.PersonId AS DataId
,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
,'特种作业人员资质还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),PersonQuality.LimitDate))+'天过期' AS MenuName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
,PersonQuality.LimitDate AS DataTime
,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
,'HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
FROM QualityAudit_PersonQuality AS PersonQuality
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
WHERE Person.IsUsed=1 and Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime >getdate() ) and
dateadd(day,-15,PersonQuality.LimitDate)<getdate() and getdate()<PersonQuality.LimitDate
and (@sType='1' or @sType='3')
and Person.ProjectId = project.ProjectId
UNION ALL
SELECT PersonQuality.PersonId AS DataId
,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
,'特种作业人员资质已过期'+convert(nvarchar(6),DATEDIFF(day,PersonQuality.LimitDate,getdate()))+'天' AS MenuName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
,PersonQuality.LimitDate AS DataTime
,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
,'HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
FROM QualityAudit_PersonQuality AS PersonQuality
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
WHERE Person.IsUsed=1 and Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime >getdate() ) and
PersonQuality.LimitDate<getdate() and (@sType='1' or @sType='2') and
Person.ProjectId =projectUser.ProjectId
UNION ALL
SELECT InspectionPersonId AS DataId
,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
,'人员报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'天过期 ' AS MenuName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
,Person.ValidityDate AS DataTime
,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionPersonEdit.aspx?projectId='+project.ProjectId+'&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE Person.IsOnSite=1 and (@sType='1' or @sType='3') and
dateadd(day,-15,Person.ValidityDate)<getdate() and getdate()<Person.ValidityDate and
Person.ProjectId = projectUser.ProjectId
and project.ProjectState='1'
UNION ALL
SELECT InspectionPersonId AS DataId
,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
,'人员报验已过期'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'天 ' AS MenuName
,project.ProjectCode
,Person.PersonName AS Content
,users.UserId
,users.UserName
,Person.ValidityDate AS DataTime
,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionPersonEdit.aspx?projectId='+project.ProjectId+'&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE Person.IsOnSite=1 and (@sType='1' or @sType='2') and
Person.ValidityDate<getdate() and
Person.ProjectId = projectUser.ProjectId
and project.ProjectState='1'
UNION ALL
SELECT InspectionMachineId AS DataId
,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
,'机具报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'天过期 ' AS MenuName
,project.ProjectCode
,Machine.InspectionMachineName AS Content
,users.UserId
,users.UserName
,Machine.NextTestDate AS DataTime
,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionMachineEdit.aspx?projectId='+project.ProjectId+'&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId
left join Base_Project as project on project.ProjectId =projectUser.ProjectId
WHERE Machine.IsOnSite=1 and (@sType='1' or @sType='3') and
dateadd(day,-15,Machine.NextTestDate)<getdate() and getdate()<Machine.NextTestDate and
Machine.ProjectId = projectUser.ProjectId
and project.ProjectState='1'
UNION ALL
SELECT InspectionMachineId AS DataId
,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
,'机具报验已过期'+convert(nvarchar(6),DATEDIFF(day,Machine.NextTestDate,getdate()))+'天' AS MenuName
,project.ProjectCode
,Machine.InspectionMachineName AS Content
,users.UserId
,users.UserName
,Machine.NextTestDate AS DataTime
,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
,'CQMS/Comprehensive/InspectionMachineEdit.aspx?projectId='+project.ProjectId+'&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
left join Project_ProjectUser as projectUser on projectUser.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId =projectUser.UserId
left join Base_Project as project on project.ProjectId = projectUser.ProjectId
WHERE Machine.IsOnSite=1 and Machine.ProjectId=projectUser.ProjectId and
Machine.NextTestDate<getdate() and (@sType='1' or @sType='2')
and project.ProjectState='1'
UNION ALL
SELECT distinct Project.ProjectId AS DataId
,'2AE9D982-A499-497F-8F54-ADDA5856887E' AS MenuId
,'本月工程量完成情况尚未填报' AS MenuName
,project.ProjectCode
,'' AS Content
,users.UserId
,users.UserName
,GETDATE() AS DataTime
,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
,'JDGL/Check/QuantityCompletion.aspx?ToDo=ToDo' AS PCUrl
FROM Base_Project AS Project
LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId = pu.UserId
WHERE (pu.RoleId like '%22F78A47-F59C-4FE8-9C43-2DD304CB2108%' or pu.RoleId like '%GCB64EF3-AB0A-40BC-824D-CC314598D5DC%') and ((DATENAME(DAY,GETDATE())>=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0)
and (@sType='1' or @sType='2') and Project.ProjectId = pu.ProjectId --or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))<GETDATE())
)
UNION ALL
SELECT DISTINCT --MonthPlan.MonthPlanId AS DataId
'' AS DataId
,'94287B92-7E96-4B90-BC6F-DAF30AE3B314' AS MenuId
,'进度管理，月度计划尚未完成' AS MenuName
,project.ProjectCode
,'' AS Content
,users.UserId
,users.UserName
,GETDATE() AS DataTime
,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
,'JDGL/Check/MonthPlanEditNew.aspx?Months='+CONVERT(varchar(100),Months, 23) AS PCUrl
FROM JDGL_MonthPlan AS MonthPlan
LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId =pu.UserId
LEFT JOIN Base_Project as project on project.ProjectId =pu.ProjectId
WHERE MonthPlan.ProjectId=pu.ProjectId
and MonthPlan.DutyPerson like '%'+@userId+'%' and MonthPlan.RealDate is null and DATENAME(DAY,GETDATE())>=22 and
DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate)
and (@sType='1' or @sType='2')
UNION ALL
SELECT DISTINCT --WeekPlan.WeekPlanId AS DataId
'' AS DataId
,'56A54B4B-BBA3-4249-9FFC-3A60DAC79059' AS MenuId
,'进度管理，周进度计划尚未完成' AS MenuName
,project.ProjectCode
,'' AS Content
,users.UserId
,users.UserName
,GETDATE() AS DataTime
,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
,'JDGL/Check/WeekPlanEdit.aspx?WeekNo='+WeekPlan.WeekNo AS PCUrl
FROM JDGL_WeekPlan AS WeekPlan
LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
LEFT JOIN Sys_User AS users ON users.UserId =pu.UserId
LEFT JOIN Base_Project as project on project.ProjectId =pu.ProjectId
WHERE WeekPlan.ProjectId = pu.ProjectId
and WeekPlan.DutyPerson like '%'+@userId+'%' and WeekPlan.IsOK =0 and DATENAME(DAY,GETDATE())<=DATENAME(DAY,WeekPlan.EndDate)
and DATENAME(year,GETDATE())=DATENAME(year,WeekPlan.EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,WeekPlan.EndDate)
and (@sType='1' or @sType='2')
ORDER BY DataTime DESC
END
GO

82
DataBase/版本日志/SGGLDB_WH_2025-04-07-xiaj.sql Normal file
View File

@ -0,0 +1,82 @@
ALTER VIEW [dbo].[View_Hazard_HazardRegister]
AS
SELECT Registration.HazardRegisterId,
Registration.HazardCode,
Registration.RegisterDate,
Registration.RegisterDef,
Registration.Rectification,
Registration.Place,
Registration.ResponsibleUnit,
Registration.Observer,
Registration.Risk_Level,
Registration.RectifiedDate,
Registration.ProjectId,
Project.UnitId AS PUnitId,
ProjectUnit.UnitName AS PUnitName,
Registration.states,
Registration.IsEffective,
Registration.ResponsibleMan,
Registration.CheckManId,
Registration.CheckTime,
Registration.RectificationPeriod,
Registration.ImageUrl,
Registration.RectificationImageUrl,
Registration.RectificationTime,
Registration.ConfirmMan,
Registration.ConfirmDate,
Registration.HandleIdea,
Registration.CutPayment,
Registration.ProblemTypes,
Registration.CheckSpecialId,
Registration.CheckItemDetailId,
Registration.SupCheckItemSetId,
Registration.CheckItemSetId,
Registration.SafeSupervisionId,
Registration.SafeSupervisionIsOK,
Project.ProjectName,
Registration.CheckCycle,
ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
Unit.UnitName as ResponsibilityUnitName,
User1.UserName AS ResponsibilityManName,
ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
User2.UserName AS CheckManName,
ISNULL(User2.Telephone,'') AS CheckManTel,
User2.UnitId AS SendUnitId,
User3.UserName AS ConfirmManName,
ISNULL(User3.Telephone,'') AS ConfirmManTel,
User4.UserName AS ResponsibilityManName2,
ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel,
(CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '´ýÕû¸Ä'
WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ºÏ¸ñ'
WHEN Registration.states='2' THEN 'ÒÑÕû¸Ä-´ý¸´²éÑéÊÕ'
WHEN Registration.states='3' THEN 'Òѱջ·'
ELSE 'ÒÑ×÷·Ï' END ) AS StatesStr,
(CASE WHEN Registration.states='3' THEN 'ÒÑÕû¸Ä' ELSE 'δÕû¸Ä' END ) AS ConfirmStr,
RegisterTypes.RegisterTypesId,
RegisterTypes.RegisterTypesName,
Registration.DIC_ID,
Registration.CCManIds,
CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
FOR XML PATH('')), 1, 1,''),
Registration.Requirements,
Registration.Type,
Registration.HiddenType
FROM dbo.HSSE_Hazard_HazardRegister AS Registration
LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = Registration.ProjectId
LEFT JOIN dbo.Base_Unit AS ProjectUnit ON Project.UnitId = ProjectUnit.UnitId
LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = Registration.Place
LEFT JOIN dbo.HSSE_Hazard_HazardRegisterTypes AS RegisterTypes ON RegisterTypes.RegisterTypesId = Registration.RegisterTypesId
LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
LEFT JOIN dbo.Sys_User AS User1 ON User1.UserId = Registration.ResponsibleMan
LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
LEFT JOIN dbo.Sys_User AS User3 ON User3.UserId = Registration.ConfirmMan
LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
GO

15
DataBase/版本日志/SGGLDB_WH_2025-04-xiaj（角色授权菜单模块名称调整）.sql Normal file
View File

@ -0,0 +1,15 @@
update Sys_Const
set ConstText='关键事项与协调沟通'
where GroupId='MenuType_P' and ConstText='关键事项'
go
update Sys_Const
set ConstText='试车及移交管理'
where GroupId='MenuType_P' and ConstText='试车管理'
go
update Sys_Const
set ConstText='施工管理'
where GroupId='MenuType_P' and ConstText='进度管理'
go
delete Sys_Const
where GroupId='MenuType_P' and ConstText in('移交管理','材料管理','协调与沟通')
go

39
DataBase/版本日志/SGGLDB_WH_V2025-03-31（项目主数据对接）-xiaj.sql Normal file
View File

@ -0,0 +1,39 @@
--项目补充PMP系统项目信息
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Base_Project' AND COLUMN_NAME = 'PlanStartDate')
BEGIN
ALTER TABLE Base_Project ADD ProjectNameEn nvarchar(500);
ALTER TABLE Base_Project ADD StClientName nvarchar(200);
ALTER TABLE Base_Project ADD ClientContactor nvarchar(200);
ALTER TABLE Base_Project ADD MobileTel nvarchar(200);
ALTER TABLE Base_Project ADD PlanStartDate datetime;
ALTER TABLE Base_Project ADD PlanEndDate datetime;
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'业主名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'StClientName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'业主联系人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'ClientContactor'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'业主联系人电话' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'MobileTel'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目计划开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'PlanStartDate'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目计划结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'PlanEndDate'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目英文名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_Project', @level2type=N'COLUMN',@level2name=N'ProjectNameEn'
END
GO
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'PMP_Project' AND COLUMN_NAME = 'stClientName')
BEGIN
ALTER TABLE PMP_Project ADD stClientName nvarchar(200);
ALTER TABLE PMP_Project ADD clientContactor nvarchar(200);
ALTER TABLE PMP_Project ADD mobileTel nvarchar(200);
ALTER TABLE PMP_Project ADD planStartDate datetime;
ALTER TABLE PMP_Project ADD planEndDate datetime;
ALTER TABLE PMP_Project ADD stLocationName nvarchar(20);
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'业主名称' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stClientName'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'业主联系人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'clientContactor'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'业主联系人电话' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'mobileTel'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目计划开始日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'planStartDate'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'项目计划结束日期' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'planEndDate'
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'建设地点名称（境内、境外）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PMP_Project', @level2type=N'COLUMN',@level2name=N'stLocationName'
END
GO

55
DataBase/版本日志/SGGLDB_WH_V2025-04-03（新增隐患类型）-xiaj.sql Normal file
View File

@ -0,0 +1,55 @@
--新增隐患类型
update HSSE_Hazard_HazardRegister set Risk_Level='一般事故隐患' where Risk_Level='一般';
go
update HSSE_Hazard_HazardRegister set Risk_Level='重大事故隐患' where Risk_Level='重大';
go
update HSSE_Hazard_HazardRegister set Risk_Level='较大事故隐患' where Risk_Level='较大';
go
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '15B87AA0-556E-49A0-9293-0EA4EACF8D04', '其他伤害', '其他伤害',14,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '15B87AA0-556E-49A0-9293-0EA4EACF8D04' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT 'D40FB4D8-E062-472F-A207-579A8693C2FD', '其他爆炸', '其他爆炸',15,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = 'D40FB4D8-E062-472F-A207-579A8693C2FD' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '229655EC-D220-483A-85A3-632FD092A158', '透水', '透水',16,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '229655EC-D220-483A-85A3-632FD092A158' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '6D51F2BB-0BE1-4B7A-896F-32AFE26FD1C6', '冒顶片帮', '冒顶片帮',17,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '6D51F2BB-0BE1-4B7A-896F-32AFE26FD1C6' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '75E13D80-CD89-4D38-85F2-AF71C6CA94B3', '放炮', '放炮',18,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '75E13D80-CD89-4D38-85F2-AF71C6CA94B3' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '106FAA43-22B6-43A8-BBFA-E7E4129416CF', '瓦斯爆炸', '瓦斯爆炸',19,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '106FAA43-22B6-43A8-BBFA-E7E4129416CF' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '7CAC43A0-CC3F-4AD0-9FFD-BC4FA9B6169D', '火药爆炸', '火药爆炸',20,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '7CAC43A0-CC3F-4AD0-9FFD-BC4FA9B6169D' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '18B44A92-D602-44AC-BCEF-913873A94757', '锅炉爆炸', '锅炉爆炸',21,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '18B44A92-D602-44AC-BCEF-913873A94757' AND GroupId='Hiddendangertype');
INSERT INTO Sys_Const(ID,ConstValue,ConstText,SortIndex,GroupId)
SELECT '59A2D1CB-311F-4015-9F55-88707101284B', '容器爆炸', '容器爆炸',22,'Hiddendangertype'
WHERE NOT EXISTS (SELECT 1 FROM Sys_Const WHERE ID = '59A2D1CB-311F-4015-9F55-88707101284B' AND GroupId='Hiddendangertype');
go

347
DataBase/版本日志/SUBQHSE_V2025-04-01-bwj.sql Normal file
View File

@ -0,0 +1,347 @@
--获取当前人待办事项
ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems]
@projectId NVARCHAR(50)=NULL,
@userId NVARCHAR(200)=NULL
AS
/*获取当前人待办事项*/
BEGIN
SELECT HazardRegisterId AS DataId
,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
,'安全巡检待整改' AS MenuName
,(case when len(register.RegisterDef)>15 then left(register.RegisterDef,15)+'...' else register.RegisterDef end)AS Content
,UserId
,users.UserName
,register.RegisterDate AS DataTime
,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
FROM HSSE_Hazard_HazardRegister AS register
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE register.ProjectId=@projectId AND
((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') ))
)
UNION ALL
SELECT HazardRegisterId AS DataId
,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId
,'安全巡检待确认' AS MenuName
,(case when len(register.RegisterDef)>15 then left(register.RegisterDef,15)+'...' else register.RegisterDef end) AS Content
,UserId
,users.UserName
,register.RegisterDate AS DataTime
,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr
,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl
FROM HSSE_Hazard_HazardRegister AS register
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE register.ProjectId=@projectId AND
register.states = '2' AND register.CheckManId =@userId
UNION ALL
SELECT CheckControlCode AS DataId
,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId
,'质量巡检待处理' AS MenuName
,checkControl.QuestionDef AS Content
,UserId
,users.UserName
,checkControl.CheckDate AS DataTime
,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr
,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl
FROM Check_CheckControl AS checkControl
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE checkControl.ProjectId=@projectId AND
checkControl.State != '7' AND checkControl.CheckControlCode in (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
UNION ALL
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))
)
--UNION ALL
--SELECT InspectionEquipmentId AS DataId
-- ,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId
-- ,'设备材料报验待确认' AS MenuName
-- ,Equipment.InspectionName AS Content
-- ,UserId
-- ,users.UserName
-- ,Equipment.InspectionDate AS DataTime
-- ,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr
-- ,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl
--FROM Comprehensive_InspectionEquipment AS Equipment
--LEFT JOIN Sys_User AS users ON users.UserId =@userId
--WHERE Equipment.ProjectId=@projectId and
--Equipment.Status!='3' AND Equipment.InspectionEquipmentId in (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
--UNION ALL
--SELECT InspectionPersonId AS DataId
-- ,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
-- ,'人员报验待确认' AS MenuName
-- ,Person.PersonName AS Content
-- ,UserId
-- ,users.UserName
-- ,Person.CompileDate AS DataTime
-- ,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
-- ,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
--FROM Comprehensive_InspectionPerson AS Person
--LEFT JOIN Sys_User AS users ON users.UserId =@userId
--WHERE Person.ProjectId=@projectId and
--Person.Status!='3' AND Person.InspectionPersonId in (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
--UNION ALL
--SELECT InspectionMachineId AS DataId
-- ,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
-- ,'机具报验待确认' AS MenuName
-- ,Machine.InspectionMachineName AS Content
-- ,UserId
-- ,users.UserName
-- ,Machine.CompileDate AS DataTime
-- ,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
-- ,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
--FROM Comprehensive_InspectionMachine AS Machine
--LEFT JOIN Sys_User AS users ON users.UserId =@userId
--WHERE Machine.ProjectId=@projectId and
--Machine.Status!='3' AND Machine.InspectionMachineId in (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' and approve.ApproveMan=@userId and approve.ApproveDate is null )
UNION ALL
SELECT ConstructSolutionId AS DataId
,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId
,'施工方案待处理' AS MenuName
,Solution.SolutionName AS Content
,UserId
,users.UserName
,Solution.CompileDate AS DataTime
,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr
,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl
FROM Solution_CQMSConstructSolution AS Solution
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Solution.ProjectId=@projectId and
Solution.State!='3'
AND Solution.ConstructSolutionId in
(select top 1 ConstructSolutionId from (
SELECT Solution_CQMSConstructSolutionApprove.*
FROM Solution_CQMSConstructSolutionApprove,
(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' and ApproveDate is null GROUP BY ConstructSolutionId )b
WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] and Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId
) approve
where approve.ApproveMan=@userId )
UNION ALL
SELECT InspectionId AS DataId
,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId
,'共检通知单待处理' AS MenuName
,InspectionManagement.AcceptanceSite AS Content
,UserId
,users.UserName
,InspectionManagement.CompileDate AS DataTime
,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr
,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl
FROM ProcessControl_InspectionManagement AS InspectionManagement
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE InspectionManagement.ProjectId=@projectId and
dateadd(day,3,InspectionManagement.CompileDate)>getdate() and InspectionManagement.AcceptanceCheckMan like '%'+@userId+'%'
UNION ALL
SELECT CheckSpecialId AS DataId
,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId
,'专项检查' AS MenuName
,CheckItemSet.CheckItemName AS Content
,UserId
,users.UserName
,CheckSpecial.CheckTime AS DataTime
,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr
,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl
FROM Check_CheckSpecial AS CheckSpecial
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId
WHERE CheckSpecial.ProjectId=@projectId and
dateadd(day,3,CheckSpecial.CheckTime)>getdate() and CheckSpecial.PartInPersonIds like '%'+@userId+'%'
UNION ALL
SELECT CheckColligationId AS DataId
,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId
,'综合检查待处理' AS MenuName
,case CheckType when '0' then '周检' when '1' then '月检' else '其它' end AS Content
,users.UserId
,users.UserName
,CheckColligation.CheckTime AS DataTime
,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr
,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl
FROM Check_CheckColligation AS CheckColligation
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId
LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId
WHERE CheckColligation.ProjectId=@projectId and FlowOperate.IsClosed <> 1 and FlowOperate.OperaterId=@userId
UNION ALL
SELECT PatrolPlanId AS DataId
,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId
,'风险巡检待处理' AS MenuName
,HazardListItem.HazardItems AS Content
,UserId
,users.UserName
,PatrolPlan.LimitCheckDate AS DataTime
,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr
,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl
FROM Hazard_PatrolPlan AS PatrolPlan
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId
WHERE HazardListItem.ProjectId=@projectId and
dateadd(day,-3,PatrolPlan.LimitCheckDate)<getdate() and PatrolPlan.DutyPerson=@userId
and (select COUNT(*) from Hazard_RoutingInspection ri where ri.PatrolPlanId=PatrolPlan.PatrolPlanId)=0
UNION ALL
SELECT PersonQuality.PersonId AS DataId
,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
,'特种作业人员资质还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),PersonQuality.LimitDate))+'天过期' AS MenuName
,Person.PersonName AS Content
,users.UserId
,users.UserName
,PersonQuality.LimitDate AS DataTime
,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
FROM QualityAudit_PersonQuality AS PersonQuality
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime >getdate() ) and
dateadd(day,-15,PersonQuality.LimitDate)<getdate() and getdate()<PersonQuality.LimitDate
UNION ALL
SELECT PersonQuality.PersonId AS DataId
,'EBEA762D-1F46-47C5-9EAD-759E13D9B41C' AS MenuId
,'特种作业人员资质已过期'+convert(nvarchar(6),DATEDIFF(day,PersonQuality.LimitDate,getdate()))+'天' AS MenuName
,Person.PersonName AS Content
,users.UserId
,users.UserName
,PersonQuality.LimitDate AS DataTime
,CONVERT(varchar(100),PersonQuality.LimitDate, 23) AS DataTimeStr
,'../HSSE/QualityAudit/PersonQualityEdit.aspx?PersonId='+PersonQuality.PersonId AS PCUrl
FROM QualityAudit_PersonQuality AS PersonQuality
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN SitePerson_Person AS Person on Person.PersonId=PersonQuality.PersonId
WHERE Person.ProjectId=@projectId and Person.IsUsed=1 and Person.InTime<getdate() and (Person.OutTime is null or Person.OutTime >getdate() ) and
PersonQuality.LimitDate<getdate()
UNION ALL
SELECT InspectionPersonId AS DataId
,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
,'人员报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Person.ValidityDate))+'天过期' AS MenuName
,Person.PersonName AS Content
,UserId
,users.UserName
,Person.ValidityDate AS DataTime
,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
dateadd(day,-15,Person.ValidityDate)<getdate() and getdate()<Person.ValidityDate
UNION ALL
SELECT InspectionPersonId AS DataId
,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId
,'人员报验已过期'+convert(nvarchar(6),DATEDIFF(day,Person.ValidityDate,getdate()))+'天' AS MenuName
,Person.PersonName AS Content
,UserId
,users.UserName
,Person.ValidityDate AS DataTime
,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr
,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl
FROM Comprehensive_InspectionPerson AS Person
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Person.ProjectId=@projectId and Person.IsOnSite=1 and
Person.ValidityDate<getdate()
UNION ALL
SELECT InspectionMachineId AS DataId
,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
,'机具报验还有'+convert(nvarchar(6),DATEDIFF(day,getdate(),Machine.NextTestDate))+'天过期' AS MenuName
,Machine.InspectionMachineName AS Content
,UserId
,users.UserName
,Machine.NextTestDate AS DataTime
,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
dateadd(day,-15,Machine.NextTestDate)<getdate() and getdate()<Machine.NextTestDate
UNION ALL
SELECT InspectionMachineId AS DataId
,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId
,'机具报验已过期'+convert(nvarchar(6),DATEDIFF(day,Machine.NextTestDate,getdate()))+'天' AS MenuName
,Machine.InspectionMachineName AS Content
,UserId
,users.UserName
,Machine.NextTestDate AS DataTime
,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr
,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl
FROM Comprehensive_InspectionMachine AS Machine
LEFT JOIN Sys_User AS users ON users.UserId =@userId
WHERE Machine.ProjectId=@projectId and Machine.IsOnSite=1 and
Machine.NextTestDate<getdate()
UNION ALL
SELECT distinct Project.ProjectId AS DataId
,'2AE9D982-A499-497F-8F54-ADDA5856887E' AS MenuId
,'本月工程量完成情况尚未填报' AS MenuName
,'' AS Content
,users.UserId
,users.UserName
,GETDATE() AS DataTime
,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
,'../JDGL/Check/QuantityCompletion.aspx?ToDo=ToDo' AS PCUrl
FROM Base_Project AS Project
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
WHERE Project.ProjectId=@projectId
and (pu.RoleId like '%22F78A47-F59C-4FE8-9C43-2DD304CB2108%' or pu.RoleId like '%GCB64EF3-AB0A-40BC-824D-CC314598D5DC%') and ((DATENAME(DAY,GETDATE())>=22 and (select COUNT(*) from JDGL_QuantityCompletion WHERE ProjectId=@projectId and DATENAME(year,GETDATE())=DATENAME(year,EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0)
--or (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))<GETDATE())
)
UNION ALL
SELECT DISTINCT --MonthPlan.MonthPlanId AS DataId
'' AS DataId
,'94287B92-7E96-4B90-BC6F-DAF30AE3B314' AS MenuId
,'进度管理，月度计划尚未完成' AS MenuName
,'' AS Content
,users.UserId
,users.UserName
,GETDATE() AS DataTime
,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
,'../JDGL/Check/MonthPlanEditNew.aspx?ToDo=ToDo&Months='+CONVERT(varchar(100),Months, 23) AS PCUrl
FROM JDGL_MonthPlan AS MonthPlan
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
WHERE MonthPlan.ProjectId=@projectId
and MonthPlan.DutyPerson like '%'+@userId+'%' and MonthPlan.RealDate is null and DATENAME(DAY,GETDATE())>=22 and
DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate)
UNION ALL
SELECT DISTINCT --WeekPlan.WeekPlanId AS DataId
'' AS DataId
,'56A54B4B-BBA3-4249-9FFC-3A60DAC79059' AS MenuId
,'进度管理，周进度计划尚未完成' AS MenuName
,'' AS Content
,users.UserId
,users.UserName
,GETDATE() AS DataTime
,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr
,'../JDGL/Check/WeekPlanEdit.aspx?ToDo=ToDo&WeekNo='+WeekPlan.WeekNo AS PCUrl
FROM JDGL_WeekPlan AS WeekPlan
LEFT JOIN Sys_User AS users ON users.UserId =@userId
LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId
WHERE WeekPlan.ProjectId=@projectId
and WeekPlan.DutyPerson like '%'+@userId+'%' and WeekPlan.IsOK =0 and DATENAME(DAY,GETDATE())<=DATENAME(DAY,WeekPlan.EndDate)
and DATENAME(year,GETDATE())=DATENAME(year,WeekPlan.EndDate) and DATENAME(MONTH,GETDATE())=DATENAME(MONTH,WeekPlan.EndDate)
ORDER BY DataTime DESC
END
GO

2
SGGL/BLL/API/HSSE/APIHazardRegisterService.cs
View File

@ -74,7 +74,7 @@ namespace BLL
HandleIdea = hazardRegister.HandleIdea,
CutPayment = hazardRegister.CutPayment,
ProblemTypes = hazardRegister.ProblemTypes,
RegisterTypesId = hazardRegister.RegisterTypesId,
//RegisterTypesId = hazardRegister.RegisterTypesId,
CheckCycle = hazardRegister.CheckCycle,
SafeSupervisionIsOK = hazardRegister.SafeSupervisionIsOK,
IsWx = "Y",

2
SGGL/BLL/CQMS/Check/CheckControlApproveService.cs
View File

@ -101,7 +101,7 @@ namespace BLL
/// <returns>一个质量巡检审批实体</returns>
public static Model.Check_CheckControlApprove GetCheckControlApproveByCheckControlId(string CheckControlCode)
{
return db.Check_CheckControlApprove.OrderByDescending(x=>x.ApproveDate).FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType != "S" && x.ApproveDate != null);
return db.Check_CheckControlApprove.FirstOrDefault(x => x.CheckControlCode == CheckControlCode && x.ApproveType != "S" && x.ApproveDate == null);
}
/// <summary>
/// 修改质量巡检审批信息

277
SGGL/BLL/Common/Const.cs
View File

@ -18,10 +18,25 @@ namespace BLL
public const string sysglyId = "AF17168B-87BD-4GLY-1111-F0A0A1158F9B";
/// <summary>
/// 系统管理员ID
/// 系统管理员ID——JT
/// </summary>
public const string hfnbdId = "C4A62EC0-E5D3-4EBF-A5FA-E56AA89633C0";
/// <summary>
/// 施工部——付伟
/// </summary>
public const string fuweiId = "dd72a950-8a8e-4958-ba8c-954c58a9beea";
/// <summary>
/// 施工部——申银行
/// </summary>
public const string shenyinhangId = "fb3b3171-f2f3-40b1-b40b-9424cc14ecfe";
/// <summary>
/// 施工部——张慧娟
/// </summary>
public const string zhanghuijuanId = "8cd25563-429e-4ac7-a13f-610e35eea62d";
/// <summary>
/// 公共临时账户ID
/// </summary>
@ -282,136 +297,6 @@ namespace BLL
public const string PostType_5 = "5";
#endregion
#region 内置岗位
/// <summary>
/// HSE工程师岗位Id
/// </summary>
public static string WorkPost_HSSEEngineer = "D1115B78-C9E1-43A4-8AB1-FF099CAF7BA4";
/// <summary>
/// 项目安全总监岗位Id
/// </summary>
public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
/// <summary>
/// HSE经理岗位Id
/// </summary>
public static string WorkPost_SafetyManager = "eac153fd-4cf3-4f5f-984d-022a636d47aa";
/// <summary>
/// HSE副经理岗位Id
/// </summary>
public static string WorkPost_SafetyManagerFu = "46AA7960-1D35-4D5B-8C8F-AA4C874D63C8";
/// <summary>
/// 无损检测工岗位Id
/// </summary>
public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297";
/// <summary>
/// 木工岗位Id
/// </summary>
public static string WorkPost_Carpentry = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881";
/// <summary>
/// 钢筋工岗位Id
/// </summary>
public static string WorkPost_SteelWorker = "E735CF61-096B-4134-B6D4-766B4B8EF790";
/// <summary>
/// 瓦工岗位Id
/// </summary>
public static string WorkPost_Bricklayer = "5E07B570-2E2C-470E-8379-7FEAECF8F62A";
/// <summary>
/// 混凝土工岗位Id
/// </summary>
public static string WorkPost_ConcreteWorker = "14f1fa16-965e-427d-a342-edbb3230ae3c";
/// <summary>
/// 钳工岗位Id
/// </summary>
public static string WorkPost_Fitter1 = "c7431c69-fb64-4960-a9da-2c7b8d380097";
/// <summary>
/// 钳工岗位Id
/// </summary>
public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C";
/// <summary>
/// 铆工岗位Id
/// </summary>
public static string WorkPost_Riveter = "338A8CB9-FB41-4E09-A2BD-ADD27BDBE9DE";
/// <summary>
/// 管工岗位Id
/// </summary>
public static string WorkPost_Foreman = "edc167d9-e2ed-4ed9-8c4d-9c179ff0286f";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician1 = "29999836-fcdd-43f5-ab6c-77c5e0d6ce0d";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician2 = "5CBA1BD0-B66B-4362-8CF3-CEA9D3F425DB";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician3 = "bb71b5f6-d6c6-49d8-83aa-577c6f0808a0";
/// <summary>
/// 仪表工岗位Id
/// </summary>
public static string WorkPost_Instrumentalist = "EFBA9A9A-FF98-47B4-949E-951A8F4E42E5";
/// <summary>
/// 防腐保温工岗位Id
/// </summary>
public static string WorkPost_AnticorrosionWorker = "010CBFD3-51B9-4C48-A6F8-15326D810AA5";
/// <summary>
/// 普工岗位Id
/// </summary>
public static string WorkPost_PGWorker = "D30865B9-A966-441D-84AC-289BCC5A9E4D";
/// <summary>
/// 其他岗位Id
/// </summary>
public static string WorkPost_Other = "71D6437A-6EE4-434A-A68C-BBB2B00FB6C6";
#endregion
#region 系统环境设置常量
/// <summary>
/// 月报上报时间
@ -634,6 +519,136 @@ namespace BLL
public const string CarEngineer = "89F8AA0B-77ED-4B17-B697-EFF7259C790B";
#endregion
#region 内置岗位
/// <summary>
/// HSE工程师岗位Id
/// </summary>
public static string WorkPost_HSSEEngineer = "D1115B78-C9E1-43A4-8AB1-FF099CAF7BA4";
/// <summary>
/// 项目安全总监岗位Id
/// </summary>
public static string WorkPost_ProjectHSSEDirector = "5e6e259e-ea0a-4a63-8f52-df4a19a6c9fa";
/// <summary>
/// HSE经理岗位Id
/// </summary>
public static string WorkPost_SafetyManager = "eac153fd-4cf3-4f5f-984d-022a636d47aa";
/// <summary>
/// HSE副经理岗位Id
/// </summary>
public static string WorkPost_SafetyManagerFu = "46AA7960-1D35-4D5B-8C8F-AA4C874D63C8";
/// <summary>
/// 无损检测工岗位Id
/// </summary>
public static string WorkPost_Checker = "595999E9-75A8-4064-9BD1-9EE02F236297";
/// <summary>
/// 木工岗位Id
/// </summary>
public static string WorkPost_Carpentry = "4ACC633F-BD81-4CBB-9058-A4E4DFFE7881";
/// <summary>
/// 钢筋工岗位Id
/// </summary>
public static string WorkPost_SteelWorker = "E735CF61-096B-4134-B6D4-766B4B8EF790";
/// <summary>
/// 瓦工岗位Id
/// </summary>
public static string WorkPost_Bricklayer = "5E07B570-2E2C-470E-8379-7FEAECF8F62A";
/// <summary>
/// 混凝土工岗位Id
/// </summary>
public static string WorkPost_ConcreteWorker = "14f1fa16-965e-427d-a342-edbb3230ae3c";
/// <summary>
/// 钳工岗位Id
/// </summary>
public static string WorkPost_Fitter1 = "c7431c69-fb64-4960-a9da-2c7b8d380097";
/// <summary>
/// 钳工岗位Id
/// </summary>
public static string WorkPost_Fitter2 = "F49B8430-AC71-40B2-86A3-6825C73F59E5";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder1 = "16c736b6-7ee1-4069-8b57-1a658e6a615f";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder2 = "36644e8c-0593-4ca7-880f-6a55510c51a1";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder3 = "5383f797-da4a-4547-b2aa-905a99c1bcfa";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder4 = "97afac2d-7ffb-49de-bf15-4b49ef24df63";
/// <summary>
/// 焊工岗位Id
/// </summary>
public static string WorkPost_Welder5 = "F8CD2EB0-1D46-422B-A21C-331669B2CF6C";
/// <summary>
/// 铆工岗位Id
/// </summary>
public static string WorkPost_Riveter = "338A8CB9-FB41-4E09-A2BD-ADD27BDBE9DE";
/// <summary>
/// 管工岗位Id
/// </summary>
public static string WorkPost_Foreman = "edc167d9-e2ed-4ed9-8c4d-9c179ff0286f";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician1 = "29999836-fcdd-43f5-ab6c-77c5e0d6ce0d";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician2 = "5CBA1BD0-B66B-4362-8CF3-CEA9D3F425DB";
/// <summary>
/// 电工岗位Id
/// </summary>
public static string WorkPost_Electrician3 = "bb71b5f6-d6c6-49d8-83aa-577c6f0808a0";
/// <summary>
/// 仪表工岗位Id
/// </summary>
public static string WorkPost_Instrumentalist = "EFBA9A9A-FF98-47B4-949E-951A8F4E42E5";
/// <summary>
/// 防腐保温工岗位Id
/// </summary>
public static string WorkPost_AnticorrosionWorker = "010CBFD3-51B9-4C48-A6F8-15326D810AA5";
/// <summary>
/// 普工岗位Id
/// </summary>
public static string WorkPost_PGWorker = "D30865B9-A966-441D-84AC-289BCC5A9E4D";
/// <summary>
/// 其他岗位Id
/// </summary>
public static string WorkPost_Other = "71D6437A-6EE4-434A-A68C-BBB2B00FB6C6";
#endregion
#region 报表流程定义
/// <summary>
/// 编制中

35
SGGL/BLL/PMP/PMPDataService.cs
View File

File diff suppressed because one or more lines are too long

44
SGGL/BLL/PZHGL/GJSX/GJSXMonitorService.cs
View File

@ -10,6 +10,10 @@ using System.Data;
using NPOI.SS.Formula.Functions;
using System.Reflection;
using System.Text;
using System.Net.Security;
using System.Security.Cryptography.X509Certificates;
using System.Threading.Tasks;
using System.Threading;
namespace BLL
@ -90,19 +94,23 @@ namespace BLL
var userIds = BLL.UserService.GetUserHaveEmailList();
if (userIds.Any() && lstOverdue.Any())
{
//int allnum = 0;
var lstProject = lstOverdue.Select(x => new { x.ProjectId, x.ProjectName }).Distinct().ToList();
foreach (var pro in lstProject)
{
//if (allnum > 50) { break; }
var lstProjectOverdue = lstOverdue.Where(x => x.ProjectId == pro.ProjectId).ToList();
if (lstProjectOverdue.Any())
{
string projectName = pro.ProjectName;
foreach (var user in userIds)
{
//if (allnum > 100) { break; }
MailMessage mail = new MailMessage();
//邮件主题
mail.Subject = $"关键事项超期预警提醒——{projectName}";
mail.To.Add(user.Email);
//mail.To.Add("test@test.com");
mail.IsBodyHtml = true;//确保邮件正文被当作HTML解析
StringBuilder tbodyStr = new StringBuilder();
@ -113,7 +121,7 @@ namespace BLL
{
foreach (var item in acceptanceItems)
{
tbodyStr.Append($"<tr><td>{index}</td><td>本人负责</td><td>{item.UnitName}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
tbodyStr.Append($"<tr><td>{index}</td><td>本人负责</td><td>{item.UnitName}</td><td>{item.GJSXID}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
index++;
}
}
@ -123,7 +131,7 @@ namespace BLL
{
foreach (var item in userItems)
{
tbodyStr.Append($"<tr><td>{index}</td><td>本人发起</td><td>{item.UnitName}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
tbodyStr.Append($"<tr><td>{index}</td><td>本人发起</td><td>{item.UnitName}</td><td>{item.GJSXID}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
index++;
}
}
@ -133,7 +141,7 @@ namespace BLL
{
foreach (var item in receiveItems)
{
tbodyStr.Append($"<tr><td>{index}</td><td>本人跟踪</td><td>{item.UnitName}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
tbodyStr.Append($"<tr><td>{index}</td><td>本人跟踪</td><td>{item.UnitName}</td><td>{item.GJSXID}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
index++;
}
}
@ -143,7 +151,7 @@ namespace BLL
{
foreach (var item in csUserItems)
{
tbodyStr.Append($"<tr><td>{index}</td><td>抄送本人</td><td>{item.UnitName}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
tbodyStr.Append($"<tr><td>{index}</td><td>抄送本人</td><td>{item.UnitName}</td><td>{item.GJSXID}</td><td>{item.Detail}</td><td>{item.GJSXTypeName}</td><td>{item.UserName}</td><td>{item.User_AcceptanceUserName}</td><td>{item.CompleteDate.ToShortDateString()}</td><td>{(item.DateDiffDays > 0 ? item.DateDiffDays.ToString() : "半")}</td></tr>");
index++;
}
}
@ -171,6 +179,7 @@ namespace BLL
<th>序号</th>
<th>类型</th>
<th>责任单位</th>
<th>事项ID</th>
<th>事项描述</th>
<th>事项类别</th>
<th>发起人</th>
@ -182,12 +191,15 @@ namespace BLL
<tbody>" + tbodyStr.ToString() + "</tbody></table></body></html>";
mail.Body = bodyStr;
PushEmail(mail);
if (index > 1)
{
//allnum++;
bool send = PushEmail(mail);
//Thread.Sleep(1000); //暂停1秒
}
}
}
}
}
#endregion
@ -195,6 +207,7 @@ namespace BLL
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("关键事项邮件预警", ex);
}
}
@ -202,29 +215,42 @@ namespace BLL
/// 发送邮件
/// </summary>
/// <param name="mail"></param>
private static void PushEmail(MailMessage mail)
private static bool PushEmail(MailMessage mail)
{
//await Task.Delay(1000); //等待1000毫秒
// 忽略SSL证书验证
ServicePointManager.ServerCertificateValidationCallback =
delegate (object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
{
return true;
};
//获取发送邮箱配置
Email_Pop pops = BLL.Email_PopService.GetEmail_Pop("7EC5E991-B7A0-495A-90ED-2BE15370C959");
if (pops != null)
{
mail.From = new MailAddress(pops.EmailYx);//发件人邮箱地址
SmtpClient client = new SmtpClient(pops.EmailFwq);//替换为你的SMTP服务器地址
client.Port = int.Parse(pops.EmailDk);//587或465如果使用SSL
client.EnableSsl = true;//如果服务器支持SSL，设置为true
client.DeliveryMethod = SmtpDeliveryMethod.Network;
client.UseDefaultCredentials = false;
client.Credentials = new NetworkCredential(pops.EmailYx, pops.EmailPass);//替换为你的邮箱和服务授权码
mail.From = new MailAddress(pops.EmailYx);//发件人邮箱地址
client.Timeout = 6000;//6秒超时
try
{
client.Send(mail);
client.Dispose();//释放资源
return true;
//Console.WriteLine("Email sent successfully.");
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("关键事项发送邮件预警", ex);
return false;
//Console.WriteLine("Email sending failed: " + ex.Message);
}
}
return false;
}
}

12
SGGL/BLL/ProjectData/ProjectService.cs
View File

@ -111,8 +111,11 @@
ProjectCode = project.ProjectCode,
JTProjectCode = project.JTProjectCode,
ProjectName = project.ProjectName,
ProjectNameEn = project.ProjectNameEn,
StartDate = project.StartDate,
EndDate = project.EndDate,
PlanStartDate = project.PlanStartDate,
PlanEndDate = project.PlanEndDate,
ProjectAddress = project.ProjectAddress,
ContractNo = project.ContractNo,
WorkRange = project.WorkRange,
@ -133,6 +136,9 @@
ProjectMoney = project.ProjectMoney,
ConstructionMoney = project.ConstructionMoney,
Telephone = project.Telephone,
StClientName = project.StClientName,
ClientContactor = project.ClientContactor,
MobileTel = project.MobileTel,
Country = project.Country,
Province = project.Province,
City = project.City,
@ -162,8 +168,11 @@
newProject.ProjectCode = project.ProjectCode;
newProject.JTProjectCode = project.JTProjectCode;
newProject.ProjectName = project.ProjectName;
newProject.ProjectNameEn = project.ProjectNameEn;
newProject.StartDate = project.StartDate;
newProject.EndDate = project.EndDate;
newProject.PlanStartDate = project.PlanStartDate;
newProject.PlanEndDate = project.PlanEndDate;
newProject.ProjectAddress = project.ProjectAddress;
newProject.ShortName = project.ShortName;
newProject.ContractNo = project.ContractNo;
@ -184,6 +193,9 @@
newProject.ProjectMoney = project.ProjectMoney;
newProject.ConstructionMoney = project.ConstructionMoney;
newProject.Telephone = project.Telephone;
newProject.StClientName = project.StClientName;
newProject.ClientContactor = project.ClientContactor;
newProject.MobileTel = project.MobileTel;
newProject.Country = project.Country;
newProject.Province = project.Province;
newProject.City = project.City;

2
SGGL/BLL/WebService/CNCECHSSEWebService.cs
View File

@ -3532,7 +3532,7 @@
{
//查询所有在建项目
var upReport = (from x in db.Base_Project
where (x.ProjectState == "1" || x.ProjectState == null)
where (x.ProjectState == "1" || x.ProjectState == null) && (x.IsDelete == null || x.IsDelete == false)
select new Model.BaseProjectItem
{
ProjectId = x.ProjectId,

2
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
View File

@ -1385,7 +1385,7 @@ namespace BLL
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.ProjectId == projectid && x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
select x.TrainPersonNum).ToList().Sum(x => x.Value);
select x).ToList().Sum(x => x.TrainPersonNum ?? 0);
return result;
}

8
SGGL/BLL/ZHGL/RealName/RealNameMonitorService.cs
View File

@ -18,7 +18,7 @@ namespace BLL
/// </summary>
public static void StartMonitor()
{
int adTimeJ = Funs.GetNewInt(ConfigurationManager.AppSettings["Intervaltime"]) ?? 30;
int adTimeJ = Funs.GetNewInt(ConfigurationManager.AppSettings["Intervaltime"]) ?? 60;
//var getSynchroSet = Funs.DB.RealName_SynchroSet.FirstOrDefault();
//if (getSynchroSet != null && getSynchroSet.Intervaltime.HasValue)
//{
@ -60,7 +60,7 @@ namespace BLL
AutoReset = true
};
messageTimer.Elapsed += new ElapsedEventHandler(UpdateSitePerson);
messageTimer.Interval = 1000 * 60 * 60 * 24;// 60分钟 60000 * adTimeJ;
messageTimer.Interval = 1000 * 60 * 30;// 60分钟 60000 * adTimeJ;
messageTimer.Start();
}
@ -86,7 +86,9 @@ namespace BLL
SynchroSetService.InsertRealNamePushLog(null, item.ProCode, "实名制定时器", "sucess", "200", item.ProName, "成功", null);
SynchroSetService.PushProCollCompany(item.ProCode);
SynchroSetService.PushAttendance(item.ProCode);
SynchroSetService.updatePersonsExitTime(item.ProCode);
UpdateSitePerson(null, null);
//SynchroSetService.updatePersonsExitTime(item.ProCode);
}
}
}

40
SGGL/BLL/ZHGL/RealName/SynchroSetService.cs
View File

@ -878,8 +878,9 @@ namespace BLL
foreach (var item in getUnit)
{
item.RealNamePushTime = DateTime.Now;
db.SubmitChanges();
}
}
db.SubmitChanges();
}
}
InsertRealNamePushLog(null, null, "推送参建企业数据", sucess, code, mess, data, pushContent);
@ -1532,9 +1533,9 @@ namespace BLL
{
getPerson.RealNameUpdateTime = DateTime.Now;
}
db.SubmitChanges();
db.SubmitChanges();
}
}
}
}
}
else
@ -1564,7 +1565,7 @@ namespace BLL
db.SubmitChanges();
}
}
}
}
}
}
}
@ -1759,18 +1760,18 @@ namespace BLL
{
{ "token", getaccess_token(proCode) }
};
if (count == 200)
{
addTeam(getData.Select(x => x.TeamGroupId).Distinct().ToList(), newToken);
getTeam(proCode, newToken);
//if (count == 200)
//{
// addTeam(getData.Select(x => x.TeamGroupId).Distinct().ToList(), newToken);
// getTeam(proCode, newToken);
var getPersonS = getData.Select(x => x.idcardNumber).Distinct().ToList();
foreach (var pitem in getPersonS)
{
PushPersonsByIdentityCard(Const.BtnAdd, proCode, pitem, false);
PushPersonsByIdentityCard(Const.BtnModify, proCode, pitem, false);
}
}
// var getPersonS = getData.Select(x => x.idcardNumber).Distinct().ToList();
// foreach (var pitem in getPersonS)
// {
// PushPersonsByIdentityCard(Const.BtnAdd, proCode, pitem, false);
// PushPersonsByIdentityCard(Const.BtnModify, proCode, pitem, false);
// }
//}
pushContent = JsonConvert.SerializeObject(listObject);
var returndata = BLL.APIGetHttpService.OutsideHttp(url, "POST", null, newToken, pushContent);
@ -1794,6 +1795,13 @@ namespace BLL
}
}
}
else
{
if (mess.Contains("token无效"))
{
getaccess_token_New(proCode);
}
}
}
InsertRealNamePushLog(null, proCode, "推送考勤数据", sucess, code, mess, data, pushContent);
if (data.Contains("无法入场") || mess.Contains("班组"))

4
SGGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx
View File

@ -1356,4 +1356,8 @@
<value>Completion status of engineering quantity</value>
<comment>工程量完成情况</comment>
</data>
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
<value>OnDuty</value>
<comment>在岗人数</comment>
</data>
</root>

3
SGGL/FineUIPro.Web/App_GlobalResources/Lan.resx
View File

@ -1200,4 +1200,7 @@
<data name="mainProject2_QuantityDone" xml:space="preserve">
<value>工程量完成情况</value>
</data>
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
<value>在岗人数</value>
</data>
</root>

3
SGGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx
View File

@ -1197,4 +1197,7 @@
<data name="mainProject2_QuantityDone" xml:space="preserve">
<value>工程量完成情况</value>
</data>
<data name="main_new0_ProjectNum_OnDuty" xml:space="preserve">
<value>在岗人数</value>
</data>
</root>

9
SGGL/FineUIPro.Web/App_GlobalResources/Lan1.designer.cs generated
View File

@ -1689,6 +1689,15 @@ namespace Resources {
}
}
/// <summary>
/// 查找类似 在岗人数 的本地化字符串。
/// </summary>
internal static string main_new0_ProjectNum_OnDuty {
get {
return ResourceManager.GetString("main_new0_ProjectNum_OnDuty", resourceCulture);
}
}
/// <summary>
/// 查找类似 参建人数 的本地化字符串。
/// </summary>

2
SGGL/FineUIPro.Web/CQMS/Check/CheckList.aspx.cs
View File

@ -377,7 +377,7 @@ namespace FineUIPro.Web.CQMS.Check
}
}
else if (isAuthenticated)
else if (isAuthenticated || CurrUser.UserId == Const.hfnbdId)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckListEdit.aspx?CheckControlCode={0}", codes, "编辑 - ")));
return;

6
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx
View File

@ -186,10 +186,10 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpHandleType" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged"
AutoPostBack="true" runat="server" Label="下一步" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpHandleType" ShowRedStar="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" Label="下一步" OnSelectedIndexChanged="drpHandleType_SelectedIndexChanged"
AutoPostBack="True" Required="true" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpHandleMan" ShowRedStar="true" runat="server" Label="办理人员" Required="true" LabelAlign="Right" EnableEdit="true">
<f:DropDownList ID="drpHandleMan" ShowRedStar="true" runat="server" EmptyText="--请选择--" AutoSelectFirstItem="false" Label="办理人员" Required="true" LabelAlign="Right" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>

83
SGGL/FineUIPro.Web/CQMS/Check/ChecklistEdit.aspx.cs
View File

@ -197,20 +197,17 @@ namespace FineUIPro.Web.CQMS.Check
}
if (State != BLL.Const.CheckControl_Complete)
{
//Funs.Bind(drpHandleType, CheckControlService.GetDHandleTypeByState(State));
CheckControlService.Init(drpHandleType, State, false);
}
if (State == BLL.Const.CheckControl_Compile)
{
this.rblIsAgree.Visible = false;
//Funs.Bind(drpHandleMan, UserService.GetMainUserList(this.CurrUser.LoginProjectId))
UserService.Init(drpHandleMan, CurrUser.LoginProjectId, false);
this.drpHandleMan.SelectedIndex = 1;
}
else
{
UserService.Init(drpHandleMan, CurrUser.LoginProjectId, false);
//Funs.Bind(drpHandleMan, UserService.GetMainUserList(this.CurrUser.LoginProjectId));
this.rblIsAgree.Visible = true;
}
@ -371,7 +368,15 @@ namespace FineUIPro.Web.CQMS.Check
}
}
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete && (this.drpHandleMan.SelectedValue == "0" || this.drpHandleMan.SelectedValue == null))
if (string.IsNullOrEmpty(drpHandleType.SelectedValue))
{
Alert.ShowInTop("请先选择下一步流程！", MessageBoxIcon.Warning);
return;
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete &&
string.IsNullOrEmpty(drpHandleMan.SelectedValue))
{
Alert.ShowInTop("请先选择办理人员！", MessageBoxIcon.Warning);
return;
@ -425,7 +430,14 @@ namespace FineUIPro.Web.CQMS.Check
}
}
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete && (this.drpHandleMan.SelectedValue == "0" || this.drpHandleMan.SelectedValue == null))
if (string.IsNullOrEmpty(drpHandleType.SelectedValue))
{
Alert.ShowInTop("请先选择下一步流程！", MessageBoxIcon.Warning);
return;
}
if (drpHandleType.SelectedValue != BLL.Const.CheckControl_Complete &&
string.IsNullOrEmpty(drpHandleMan.SelectedValue))
{
Alert.ShowInTop("请先选择办理人员！", MessageBoxIcon.Warning);
return;
@ -640,10 +652,10 @@ namespace FineUIPro.Web.CQMS.Check
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, string.Empty);
}
if (drpHandleMan.Items.Count > 0)
{
drpHandleMan.SelectedIndex = 0;
}
// if (drpHandleMan.Items.Count > 0)
// {
// drpHandleMan.SelectedIndex = 0;
// }
if (drpHandleType.SelectedText.Contains("重新编制"))
{
UserService.InitUserDropDownList(drpHandleMan, CurrUser.LoginProjectId, false, string.Empty);
@ -672,16 +684,6 @@ namespace FineUIPro.Web.CQMS.Check
protected void drpHandleType_SelectedIndexChanged(object sender, EventArgs e)
{
HandleMan();
//if (drpHandleType.SelectedValue == BLL.Const.CheckControl_Audit2 || drpHandleType.SelectedValue == BLL.Const.CheckControl_ReCompile2)
//{
// drpHandleMan.Items.Clear();
//Funs.Bind(drpHandleMan, UserService.GetUserByUnitId(this.CurrUser.LoginProjectId, drpUnit.SelectedValue));
//}
//else
//{
// drpHandleMan.Items.Clear();
// Funs.Bind(drpHandleMan, UserService.GetMainUserList(this.CurrUser.LoginProjectId));
//}
}
protected void rblIsAgree_SelectedIndexChanged(object sender, EventArgs e)
@ -693,49 +695,6 @@ namespace FineUIPro.Web.CQMS.Check
{
}
//if (state == Const.CheckControl_Compile || state == Const.CheckControl_ReCompile) //无是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("总包负责人审核", Const.CheckControl_Audit1);
// lis[1] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);
// return lis;
//}
//else if (state == Const.CheckControl_Audit1)//有是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("分包专业工程师回复", Const.CheckControl_Audit2);//是 加载
// lis[1] = new ListItem("重新整理", Const.CheckControl_ReCompile);//否加载
// return lis;
//}
//else if (state == Const.CheckControl_Audit2 || state == Const.CheckControl_ReCompile2)//无是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("分包负责人审批", Const.CheckControl_Audit3);
// lis[1] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);
// return lis;
//}
//else if (state == Const.CheckControl_Audit3)//有是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("总包专业工程师确认", Const.CheckControl_Audit4);//是 加载
// lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
// return lis;
//}
//else if (state == Const.CheckControl_Audit4)//有是否同意
//{
// ListItem[] lis = new ListItem[3];
// lis[0] = new ListItem("总包负责人确认", Const.CheckControl_Audit5);//是 加载
// lis[1] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
// lis[2] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
// return lis;
//}
//else if (state == Const.CheckControl_Audit5)//有是否同意
//{
// ListItem[] lis = new ListItem[2];
// lis[0] = new ListItem("审批完成", Const.CheckControl_Complete);//是 加载
// lis[1] = new ListItem("分包专业工程师重新回复", Const.CheckControl_ReCompile2);//否加载
// return lis;
//}
/// <summary>
/// 待办事项的下拉框的处理

113
SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReport.aspx.cs
View File

@ -152,7 +152,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
* @param doc Document对象
* @return
*/
public static Cell CreateCell(String value, Document doc, double cellWidth, string cellMerge = "",string CenterPage="",string cellUnitLeft="")
public static Cell CreateCell(String value, Document doc, double cellWidth, string cellMerge = "", string CenterPage = "", string cellUnitLeft = "")
{
Cell cell = new Cell(doc);
Paragraph p = new Paragraph(doc);
@ -185,7 +185,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
p.ParagraphFormat.Alignment = ParagraphAlignment.Center;//表格中字体居中
}
p.AppendChild(new Run(doc, value));
@ -194,7 +194,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
cell.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;
cell.CellFormat.Borders.LineWidth = 1.5;
cell.AppendChild(p);
return cell;
}
@ -227,10 +227,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
var endDate = Convert.ToDateTime(weekModel.EndDate);
//获取project
var pModel = db.Base_Project.FirstOrDefault(x => x.ProjectId == weekModel.ProjectId);
var urlHz = startDate.ToString("yyyyMMdd")+"-"
var urlHz = startDate.ToString("yyyyMMdd") + "-"
+ endDate.ToString("yyyyMMdd");
newUrl = uploadfilepath.Replace("项目质量月报", pModel.ShortName + "项目质量月报（第"+ weekModel.SortId + "期）"+ urlHz);
newUrl = uploadfilepath.Replace("项目质量月报", pModel.ShortName + "项目质量月报（第" + weekModel.SortId + "期）" + urlHz);
if (File.Exists(newUrl))
{
@ -250,9 +250,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
orderby x.UnitName
select x).FirstOrDefault();
Bookmark bkmark = doc.Range.Bookmarks["username"];
if (bkmark != null) {
Bookmark bkmark = doc.Range.Bookmarks["username"];
if (bkmark != null)
{
if (unitsYz != null)
{
bkmark.Text = unitsYz.UnitName;
@ -264,14 +265,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//}
}
bkmark= doc.Range.Bookmarks["projectNo"];
if (bkmark!=null)
bkmark = doc.Range.Bookmarks["projectNo"];
if (bkmark != null)
{
bkmark.Text = pModel.ProjectCode;
}
bkmark = doc.Range.Bookmarks["createdate"];
if (bkmark!=null)
if (bkmark != null)
{
bkmark.Text = weekModel.CreateDate.ToString().Split(' ')[0].Replace('/', '.');
}
@ -283,7 +284,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
bkmark = doc.Range.Bookmarks["quamanagername"];
if (bkmark != null) {
if (bkmark != null)
{
//var zlName = "";
////根据项目获取质量经理
//var puserList = db.Project_ProjectUser.Where(x => x.ProjectId == weekModel.ProjectId && x.RoleId.Contains(BLL.Const.QAManager)).ToList();
@ -307,19 +309,19 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
var sdate = Convert.ToDateTime(weekModel.StartDate);
var edate = Convert.ToDateTime(weekModel.EndDate);
bkmark.Text = sdate.Year+"年"+ sdate.Month +"月"+ sdate.Day+"日至"+
bkmark.Text = sdate.Year + "年" + sdate.Month + "月" + sdate.Day + "日至" +
edate.Year + "年" + edate.Month + "月" + edate.Day + "日";
}
bkmark = doc.Range.Bookmarks["reportindex"];
if (bkmark!=null)
if (bkmark != null)
{
bkmark.Text = weekModel.SortId;
}
bkmark = doc.Range.Bookmarks["fromcode"];
//fromcode,项目号-RM-PQM-顺序号
if (bkmark!=null)
if (bkmark != null)
{
bkmark.Text = pModel.ProjectCode + "-RM-PQM-" + weekModel.SortId;
}
@ -333,12 +335,13 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//跳过页眉的表头
while (isYm)
{
if (table.Range.Text.Substring(0, 2)!="序号")
if (table.Range.Text.Substring(0, 2) != "序号")
{
whileIndex += 1;
table = (Aspose.Words.Tables.Table)doc.GetChild(NodeType.Table, whileIndex, true);
}
else{
else
{
isYm = false;
}
}
@ -348,14 +351,14 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
//创建行
Row row = new Row(doc);
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width,"","1"));
row.Cells.Add(CreateCell(item.ProStage, doc, table.FirstRow.Cells[1].CellFormat.Width,"","", "unit"));
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
row.Cells.Add(CreateCell(item.ProStage, doc, table.FirstRow.Cells[1].CellFormat.Width, "", "", "unit"));
row.Cells.Add(CreateCell(item.ProDescribe, doc, table.FirstRow.Cells[2].CellFormat.Width, "", "", "unit"));
row.Cells.Add(CreateCell(item.TargetValue, doc, table.FirstRow.Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(item.MonthPer, doc, table.FirstRow.Cells[4].CellFormat.Width));
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[5].CellFormat.Width, "", "", "unit"));
table.Rows.Insert(numberIndex, row);
table.Rows.Insert(numberIndex, row);
numberIndex += 1;
}
//自动设置表格样式
@ -368,7 +371,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
bkmark = doc.Range.Bookmarks["Content1"];
if (bkmark != null)
{
bkmark.Text= txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "0").ContentText;
}
bkmark = doc.Range.Bookmarks["Content2"];
@ -388,10 +391,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "8").ContentText;
}
#endregion
var ContuructionAllList = db.Report_Construction_Plan.Where(x => x.ReportId == Id).OrderBy(x=>x.UnitOrMajor).ToList();
var ContuructionAllList = db.Report_Construction_Plan.Where(x => x.ReportId == Id).OrderBy(x => x.UnitOrMajor).ToList();
#region 3.施工方案及检验试验计划审批情况
@ -422,7 +425,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//创建行
Row row = new Row(doc);
row.Cells.Add(CreateCell(numberIndex.ToString(), doc, table.FirstRow.Cells[0].CellFormat.Width, "", "1"));
row.Cells.Add(CreateCell(item.UnitOrMajor, doc, table.FirstRow.Cells[1].CellFormat.Width,"","","unit"));
row.Cells.Add(CreateCell(item.UnitOrMajor, doc, table.FirstRow.Cells[1].CellFormat.Width, "", "", "unit"));
row.Cells.Add(CreateCell(item.Quantity1.ToString(), doc, table.FirstRow.Cells[2].CellFormat.Width));
row.Cells.Add(CreateCell(item.Quantity2.ToString(), doc, table.FirstRow.Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(item.Remarks, doc, table.FirstRow.Cells[4].CellFormat.Width, "", "", "unit"));
@ -468,7 +471,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
numberIndex = 1;
int? num1 = 0, num2 = 0, num3=0;
int? num1 = 0, num2 = 0, num3 = 0;
foreach (var item in wdsgfaList)
{
//创建行
@ -482,7 +485,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
table.Rows.Insert(numberIndex, row);
num1 += item.Quantity1;
num2 += item.Quantity2;
num3+= item.Quantity3;
num3 += item.Quantity3;
numberIndex += 1;
}
//自动设置表格样式
@ -677,9 +680,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
}
int i = 1;
var cNProfessionals = from x in Funs.DB.Base_CNProfessional where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
var cNProfessionals = from x in Funs.DB.Base_CNProfessional
where x.CNProfessionalId != BLL.Const.CNProfessionalConstructId
&& x.CNProfessionalId != BLL.Const.ComprehensiveId
orderby x.SortIndex select x;
orderby x.SortIndex
select x;
foreach (var item in cNProfessionals)
{
//专业下所有集合
@ -704,7 +709,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity5Sum += Convert.ToInt32(checkStatisc.OneOKRate);
Quantity6Sum += Convert.ToInt32(checkStatisc.TotalOneOKRate);
}
if (StatisticsList.Count>0)
if (StatisticsList.Count > 0)
{
isYm = true;
whileIndex += 1;
@ -728,7 +733,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
//创建行
Row row = new Row(doc);
row.Cells.Add(CreateCell((numberIndex-1).ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
row.Cells.Add(CreateCell((numberIndex - 1).ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "", "1"));
row.Cells.Add(CreateCell(item.WorkName, doc, table.Rows[0].Cells[1].CellFormat.Width));
row.Cells.Add(CreateCell(item.CheckNum.ToString(), doc, table.Rows[1].Cells[2].CellFormat.Width));
row.Cells.Add(CreateCell(item.TotalCheckNum.ToString(), doc, table.Rows[1].Cells[3].CellFormat.Width));
@ -768,11 +773,11 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
#region 7.1合格焊工管理情况
Quantity1Sum = 0; Quantity2Sum = 0; Quantity3Sum = 0; Quantity4Sum = 0; Quantity5Sum = 0; Quantity6Sum = 0;
Quantity1Sum = 0; Quantity2Sum = 0; Quantity3Sum = 0; Quantity4Sum = 0; Quantity5Sum = 0; Quantity6Sum = 0;
int Quantity7Sum = 0, Quantity8Sum = 0;
List<Model.PassWelderStatisc> PassWelderList = new List<Model.PassWelderStatisc>();
if (project != null)
{
if (project.StartDate != null)
@ -786,7 +791,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
where x.ProjectId == this.CurrUser.LoginProjectId && x.UnitType == BLL.Const.ProjectUnitType_2
orderby y.UnitCode
select new { x.UnitId, y.UnitName };
foreach (var item in units)
{
@ -844,7 +849,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Quantity7Sum += passWelderStatisc.OtherMountGuard;
Quantity8Sum += passWelderStatisc.OtherTotal;
}
if (PassWelderList.Count>0)
if (PassWelderList.Count > 0)
{
isYm = true;
whileIndex += 1;
@ -958,7 +963,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
}
else {
else
{
isYm = true;
numberIndex = 1;
whileIndex += 1;
@ -1003,24 +1009,16 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int? totalNum0 = 0, totalNum1 = 0;//拍片数量合计
endDate = endDate.AddDays(1);
foreach (var item in units)
{
int? num0 = 0, num1 = 0;//拍片数量小计
var query = from c in db.ProcessControl_NondestructiveTest_New
join u in db.Base_Unit on c.UnitId equals u.UnitId
where c.ProjectId == this.CurrUser.LoginProjectId && c.UnitId == item.UnitId
&& c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate <= Convert.ToDateTime(endDate)
&& c.CreateDate >= Convert.ToDateTime(startDate) && c.CreateDate < Convert.ToDateTime(endDate)
orderby c.CreateDate descending
select new
{
c.CreateDate,
c.ProjectId,
@ -1040,7 +1038,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
model.Id = Guid.NewGuid().ToString();
model.CreateMan = item.UnitName;//用作存储施工单位名称
model.ProfessionalName = "工艺管道";
if (gygdModel != null)
{
model.MonthQuantity = gygdModel.MonthQuantity;
@ -1068,9 +1065,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
NondestructiveTestlist.Add(model);
}
//地管
gygdModel = query.FirstOrDefault(x => x.ProfessionalName == "地管");
model = new Model.ProcessControl_NondestructiveTest_New();
@ -1175,11 +1169,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
int pageCount = 1;
foreach (var item in NondestructiveTestlist)
{
//创建行
Row row = new Row(doc);
//如果是第一列，或者
if (numberIndex == 1 || Unitname != item.CreateMan)
{
@ -1189,7 +1180,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
}
row.Cells.Add(CreateCell((pageCount).ToString(), doc, table.Rows[0].Cells[0].CellFormat.Width, "0", "1"));
row.Cells.Add(CreateCell(item.CreateMan, doc, table.Rows[0].Cells[1].CellFormat.Width, "0", "", "unit"));
Unitname = item.CreateMan;
}
else
@ -1199,8 +1190,6 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
Unitname = item.CreateMan;
}
row.Cells.Add(CreateCell(item.ProfessionalName.ToString(), doc, table.Rows[0].Cells[2].CellFormat.Width));
row.Cells.Add(CreateCell(item.MonthQuantity.ToString(), doc, table.Rows[0].Cells[3].CellFormat.Width));
row.Cells.Add(CreateCell(item.TotalQuantity.ToString(), doc, table.Rows[0].Cells[4].CellFormat.Width));
@ -1213,7 +1202,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
pageCount += 1;
}
}
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
@ -1233,7 +1222,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
}
else {
else
{
isYm = true;
numberIndex = 1;
whileIndex += 1;
@ -1324,7 +1314,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
//自动设置表格样式
table.AutoFit(AutoFitBehavior.FixedColumnWidths);
}
else {
else
{
isYm = true;
numberIndex = 1;
whileIndex += 1;
@ -3130,7 +3121,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
{
bkmark.Text = txtReportList.FirstOrDefault(x => x.ContentType == "23-1").ContentText;
}
}
}
bkmark = doc.Range.Bookmarks["ImageContent2"];
if (bkmark != null)

6
SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
View File

@ -40,14 +40,14 @@ namespace FineUIPro.Web.DataShow
strSql = @"SELECT ID,ProjectId,ProjectCode,ProjectName,UnitId,UnitName,SpecialEquipmentId,SpecialEquipmentName,SizeModel,OwnerCheck,CertificateNum,IsUsed,CompileDate,EQType
FROM (SELECT Item.EquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'特种设备' AS EQType
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'特种设备' AS EQType,P.ProjectState
FROM InApproveManager_EquipmentInItem AS Item
LEFT JOIN InApproveManager_EquipmentIn AS EQ ON EQ.EquipmentInId = Item.EquipmentInId
LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId
LEFT JOIN Base_Project AS P ON EQ.ProjectId = P.ProjectId
LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = EQ.UnitId
UNION ALL SELECT Item.GeneralEquipmentInItemId AS ID,EQ.ProjectId,P.ProjectCode,P.ProjectName,EQ.UnitId,Unit.UnitName,Item.SpecialEquipmentId
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'一般设备' AS EQType
,SPE.SpecialEquipmentName,Item.SizeModel,Item.OwnerCheck,Item.CertificateNum,Item.IsUsed,EQ.CompileDate,'一般设备' AS EQType,P.ProjectState
FROM InApproveManager_GeneralEquipmentInItem AS Item
LEFT JOIN InApproveManager_GeneralEquipmentIn AS EQ ON EQ.GeneralEquipmentInId = Item.GeneralEquipmentInId
LEFT JOIN Base_SpecialEquipment AS SPE ON Item.SpecialEquipmentId = SPE.SpecialEquipmentId
@ -56,6 +56,8 @@ namespace FineUIPro.Web.DataShow
WHERE 1=1 ";
strSql += " AND V.IsUsed = @IsUsed";
//在建项目数据
strSql += " AND (V.ProjectState = '1' OR V.ProjectState IS NULL)";
listStr.Add(new SqlParameter("@IsUsed", "1"));
if (this.rbType.SelectedValue == "2")
{

21
SGGL/FineUIPro.Web/DataShow/JD.aspx
View File

@ -53,10 +53,10 @@
<asp:Label ID="labNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
<f:RenderField Width="120px" ColumnID="ProjectCode" DataField="ProjectCode" FieldType="String" HeaderText="项目号" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="350px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
<f:RenderField Width="450px" ColumnID="ProjectName" ExpandUnusedSpace="true" DataField="ProjectName" FieldType="String" HeaderText="项目名称" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="RealNum" DataField="RealNum" FieldType="Float" HeaderText="项目进度(%)" TextAlign="Right"
@ -86,14 +86,20 @@
<f:Grid ID="Grid2" ShowBorder="true" ShowHeader="false" Title="各项目基本情况" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" MarginRight="15px"
SortField="ProjectName" SortDirection="ASC" OnSort="Grid2_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid2_PageIndexChange" ForceFit="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid2_PageIndexChange" ForceFit="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid2_RowDoubleClick"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DatePicker runat="server" ID="txtMonths" DateFormatString="yyyy-MM" AutoPostBack="true" DisplayType="Month"
Label="月份" LabelWidth="50px" Width="150px" OnTextChanged="TextBox2_TextChanged">
</f:DatePicker>
<f:DropDownList ID="drpProject2" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:DropDownList ID="drpDutyPerson2" runat="server" Label="责任人" Width="250px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox2_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="Button1" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
@ -157,7 +163,7 @@
<f:Grid ID="Grid3" ShowBorder="true" ShowHeader="false" Title="各项目基本情况" EnableCollapse="true"
runat="server" BoxFlex="1" DataKeyNames="ProjectId" DataIDField="ProjectId" AllowSorting="true" MarginRight="15px"
SortField="ProjectName" SortDirection="ASC" OnSort="Grid3_Sort" EnableColumnLines="true" AllowPaging="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid3_PageIndexChange" ForceFit="true"
IsDatabasePaging="true" PageSize="20" OnPageIndexChange="Grid3_PageIndexChange" ForceFit="true" EnableRowDoubleClickEvent="true" OnRowDoubleClick="Grid3_RowDoubleClick"
EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" runat="server" ToolbarAlign="Left">
@ -165,6 +171,9 @@
<f:DropDownList ID="drpProject3" runat="server" Label="项目" Width="400px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:DropDownList ID="drpDutyPerson3" runat="server" Label="责任人" Width="250px" LabelWidth="80px" LabelAlign="Right"
EnableEdit="true" OnSelectedIndexChanged="TextBox3_TextChanged" AutoPostBack="true">
</f:DropDownList>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="Button2" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" OnClientClick="closeNow();">
</f:Button>
@ -231,6 +240,10 @@
</f:TabStrip>
</Items>
</f:Panel>
<f:Window ID="Window1" Title="查看项目详情" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true"
Width="1200px" Height="660px">
</f:Window>
</form>
<script type="text/javascript">
// 点击标题栏工具图标 - 退出

124
SGGL/FineUIPro.Web/DataShow/JD.aspx.cs
View File

@ -21,8 +21,18 @@ namespace FineUIPro.Web.DataShow
ddlPageSize3.SelectedValue = Grid3.PageSize.ToString();
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject2, true);
BLL.UserService.InitSGBUser(this.drpDutyPerson2, true);
BLL.ProjectService.InitProjectDropDownList(this.drpProject3, true);
BLL.UserService.InitSGBUser(this.drpDutyPerson3, true);
BindGrid1();
//统计月份信息
DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
if (DateTime.Now.Day < 26)
{
months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
}
this.txtMonths.Text = months.ToString("yyyy-MM");
}
}
@ -66,6 +76,17 @@ left join (
Grid1.DataBind();
}
#region 月份选择事件
/// <summary>
/// 月份选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtMonths_TextChanged(object sender, EventArgs e)
{
BindGrid2();
}
#endregion
/// <summary>
/// 绑定数据
/// </summary>
@ -88,12 +109,13 @@ left join (
{
projects = projects.Where(x => x.ProjectId == this.drpProject2.SelectedValue).OrderBy(x => x.ProjectName);
}
//统计月份信息
DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
if (DateTime.Now.Day < 26)
{
months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
}
//////统计月份信息
//DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
//if (DateTime.Now.Day < 26)
//{
// months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
//}
DateTime months = Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01");
//2、获取当前项目指定月所有计划
var allMonthPlans = from x in db.JDGL_MonthPlan
where x.Months == months
@ -106,9 +128,19 @@ left join (
{
double planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double completedNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
if (this.drpDutyPerson2.SelectedValue != BLL.Const._Null)
{
planNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue)).Count();
completedNum = allMonthPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue) && x.RealDate != null).Count();
}
double rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
double totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double totalCompletedNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.RealDate != null).Count();
if (this.drpDutyPerson2.SelectedValue != BLL.Const._Null)
{
totalPlanNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue)).Count();
totalCompletedNum = allPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson2.SelectedValue) && x.RealDate != null).Count();
}
double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
DataRow row;
row = tb.NewRow();
@ -162,16 +194,26 @@ left join (
select x;
foreach (var item in projects)
{
var lastWeek = (from x in db.JDGL_WeekPlan where x.ProjectId == item.ProjectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate select x).FirstOrDefault();
var lastWeek = (from x in db.JDGL_WeekPlan where x.ProjectId == item.ProjectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate descending select x).FirstOrDefault();
double planNum = 0, completedNum = 0, rate = 0;
if (lastWeek != null)
{
planNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo).Count();
completedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.WeekNo == lastWeek.WeekNo && x.IsOK == true).Count();
if (this.drpDutyPerson3.SelectedValue != BLL.Const._Null)
{
planNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue) && x.WeekNo == lastWeek.WeekNo).Count();
completedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue) && x.WeekNo == lastWeek.WeekNo && x.IsOK == true).Count();
}
rate = planNum > 0 ? Math.Round((completedNum / planNum) * 100, 2) : 0;
}
double totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId).Count();
double totalCompletedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.IsOK == true).Count();
if (this.drpDutyPerson3.SelectedValue != BLL.Const._Null)
{
totalPlanNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue)).Count();
totalCompletedNum = allWeekPlans.Where(x => x.ProjectId == item.ProjectId && x.DutyPerson.Contains(this.drpDutyPerson3.SelectedValue) && x.IsOK == true).Count();
}
double totalRate = totalPlanNum > 0 ? Math.Round((totalCompletedNum / totalPlanNum) * 100, 2) : 0;
DataRow row;
row = tb.NewRow();
@ -340,5 +382,73 @@ left join (
}
}
}
/// <summary>
/// Grid双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid3_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
this.ViewWeekDetail();
}
/// <summary>
/// 查看
/// </summary>
private void ViewWeekDetail()
{
if (Grid3.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
else if (Grid3.SelectedRowIndexArray.Length > 1)
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
string projectId = Grid3.SelectedRowID;
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JDWeekDetail.aspx?projectId={0}", projectId, "查看明细 - ")));
}
/// <summary>
/// Grid双击事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid2_RowDoubleClick(object sender, GridRowClickEventArgs e)
{
this.ViewMonthDetail();
}
/// <summary>
/// 查看
/// </summary>
private void ViewMonthDetail()
{
if (Grid2.SelectedRowIndexArray.Length == 0)
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
else if (Grid2.SelectedRowIndexArray.Length > 1)
{
Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning);
return;
}
////统计月份信息
//DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
//if (DateTime.Now.Day < 26)
//{
// months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
//}
//string month = months.ToString("yyyy-MM-dd");
string projectId = Grid2.SelectedRowID;
string month = this.txtMonths.Text.Trim() + "-01";
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("JDMonthDetail.aspx?projectId={0}&month={1}", projectId, month, "查看明细 - ")));
}
}
}

110
SGGL/FineUIPro.Web/DataShow/JD.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow {
public partial class JD {
namespace FineUIPro.Web.DataShow
{
public partial class JD
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel2 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// TabStrip1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TabStrip TabStrip1;
/// <summary>
/// Tab1 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// drpProject 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject;
/// <summary>
/// btnClose 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnClose;
/// <summary>
/// labNumber 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label labNumber;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Tab2 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab2;
/// <summary>
/// Grid2 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid2;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -155,7 +157,16 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtMonths 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMonths;
/// <summary>
/// drpProject2 控件。
/// </summary>
@ -164,7 +175,16 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject2;
/// <summary>
/// drpDutyPerson2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDutyPerson2;
/// <summary>
/// Button1 控件。
/// </summary>
@ -173,7 +193,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button1;
/// <summary>
/// Label1 控件。
/// </summary>
@ -182,7 +202,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// ToolbarSeparator2 控件。
/// </summary>
@ -191,7 +211,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator2;
/// <summary>
/// ToolbarText2 控件。
/// </summary>
@ -200,7 +220,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText2;
/// <summary>
/// ddlPageSize2 控件。
/// </summary>
@ -209,7 +229,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize2;
/// <summary>
/// Tab3 控件。
/// </summary>
@ -218,7 +238,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab Tab3;
/// <summary>
/// Grid3 控件。
/// </summary>
@ -227,7 +247,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid3;
/// <summary>
/// Toolbar3 控件。
/// </summary>
@ -236,7 +256,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// drpProject3 控件。
/// </summary>
@ -245,7 +265,16 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProject3;
/// <summary>
/// drpDutyPerson3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpDutyPerson3;
/// <summary>
/// Button2 控件。
/// </summary>
@ -254,7 +283,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button Button2;
/// <summary>
/// Label2 控件。
/// </summary>
@ -263,7 +292,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator3 控件。
/// </summary>
@ -272,7 +301,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator3;
/// <summary>
/// ToolbarText3 控件。
/// </summary>
@ -281,7 +310,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText3;
/// <summary>
/// ddlPageSize3 控件。
/// </summary>
@ -290,7 +319,7 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize3;
/// <summary>
/// TabOnlineMenuSet 控件。
/// </summary>
@ -299,5 +328,14 @@ namespace FineUIPro.Web.DataShow {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Tab TabOnlineMenuSet;
/// <summary>
/// Window1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
}
}

97
SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx Normal file
View File

@ -0,0 +1,97 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JDMonthDetail.aspx.cs" Inherits="FineUIPro.Web.DataShow.JDMonthDetail" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>进度情况</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.LabelColor {
color: Red;
font-size: small;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel2" />
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" Margin="5px" BodyPadding="5px">
<Items>
<f:Grid ID="Grid1" ShowBorder="true" EnableAjax="false" ShowHeader="false" Title="月度计划情况" EnableCollapse="false"
runat="server" BoxFlex="1" DataKeyNames="MonthPlanId" AllowCellEditing="true" ForceFit="true" Height="560px"
ClicksToEdit="1" DataIDField="MonthPlanId" AllowSorting="true" SortField="SortIndex"
SortDirection="ASC" EnableColumnLines="true"
AllowPaging="false" IsDatabasePaging="false" PageSize="1000"
AllowFilters="true" EnableTextSelection="True">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DatePicker runat="server" ID="txtMonths" DateFormatString="yyyy-MM" AutoPostBack="true" DisplayType="Month"
Label="月份" LabelWidth="50px" Width="150px" OnTextChanged="txtMonths_TextChanged">
</f:DatePicker>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderText="责任单位" TextAlign="center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="NodeContent" DataField="NodeContent"
SortField="NodeContent" FieldType="String" HeaderText="节点内容" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" SortField="PlanDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DutyPersonName" DataField="DutyPersonName"
SortField="DutyPersonName" FieldType="String" HeaderText="五环责任人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="95px" ColumnID="RealDate" DataField="RealDate" SortField="RealDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="实际完成时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
<%-- <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />
</Listeners>--%>
</f:Grid>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
// 点击标题栏工具图标 - 退出
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}
</script>
</body>
</html>

148
SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.cs Normal file
View File

@ -0,0 +1,148 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
public partial class JDMonthDetail : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
public string Month
{
get
{
return (string)ViewState["Month"];
}
set
{
ViewState["Month"] = value;
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
if (!string.IsNullOrEmpty(Request.Params["month"]))
{
this.Month = Request.Params["month"];
}
else
{
//统计月份信息
DateTime months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString() + "-01");
if (DateTime.Now.Day < 26)
{
months = Convert.ToDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.AddMonths(-1).Month.ToString() + "-01");
}
this.Month = months.ToString("yyyy-MM-dd");
}
this.txtMonths.Text = this.Month.Replace("-01", "");
BindGrid();
}
}
#region 月份选择事件
/// <summary>
/// 月份选择事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtMonths_TextChanged(object sender, EventArgs e)
{
this.Month = string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtMonths.Text.Trim() + "-01"));
BindGrid();
}
#endregion
/// <summary>
/// 加载Grid
/// </summary>
private void BindGrid()
{
DataTable tb = BindData();
Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 加载数据
/// </summary>
/// <returns></returns>
private DataTable BindData()
{
string strSql = @"select mp.*,u.UnitName
,DutyPersonName = STUFF((SELECT ',' + p.UserName FROM dbo.Sys_User as p where PATINDEX('%,' + RTRIM(p.UserId) + ',%', ',' + mp.DutyPerson + ',') > 0 FOR XML PATH('')), 1, 1,'')
from [dbo].[JDGL_MonthPlan] mp
left join Base_Unit u on u.UnitId=mp.UnitId
where mp.ProjectId=@ProjectId and mp.Months=@month order by mp.SortIndex";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
listStr.Add(new SqlParameter("@month", this.Month));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
return tb;
}
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox2_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#region 表排序、分页、关闭窗口
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
#endregion
}
}

80
SGGL/FineUIPro.Web/DataShow/JDMonthDetail.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,80 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow
{
public partial class JDMonthDetail
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtMonths 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtMonths;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
}
}

101
SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx Normal file
View File

@ -0,0 +1,101 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="JDWeekDetail.aspx.cs" Inherits="FineUIPro.Web.DataShow.JDWeekDetail" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title>进度情况</title>
<link href="../res/css/common.css" rel="stylesheet" type="text/css" />
<style type="text/css">
.f-grid-row .f-grid-cell-inner {
white-space: normal;
word-break: break-all;
}
.LabelColor {
color: Red;
font-size: small;
}
</style>
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" runat="server" AutoSizePanelID="Panel2" />
<f:Panel ID="Panel2" runat="server" ShowHeader="false" ShowBorder="false" ColumnWidth="100%" Margin="5px" BodyPadding="5px">
<Items>
<f:Grid ID="Grid1" IsFluid="true" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" runat="server" EnableCollapse="false" PageSize="1000"
DataKeyNames="WeekPlanId" DataIDField="WeekPlanId" EnableColumnLines="true" ForceFit="true" AllowCellEditing="true" ClicksToEdit="1" Height="560px">
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList runat="server" ID="drpWeekNo" Label="周号" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="drpWeekNo_SelectedIndexChanged"></f:DropDownList>
<f:DatePicker ID="txtStartDate" runat="server" Readonly="true" Label="开始日期" LabelAlign="Right">
</f:DatePicker>
<f:DatePicker ID="txtEndDate" runat="server" Readonly="true" Label="结束日期" LabelAlign="Right">
</f:DatePicker>
</Items>
</f:Toolbar>
</Toolbars>
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="55px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="False">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="100px" ColumnID="UnitWorkName" DataField="UnitWorkName"
SortField="UnitWorkName" FieldType="String" HeaderText="工序/单位工程" TextAlign="center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="80px" ColumnID="ProfessionalName" DataField="ProfessionalName"
SortField="ProfessionalName" FieldType="String" HeaderText="专业" TextAlign="center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="250px" ColumnID="WorkContent" DataField="WorkContent"
SortField="WorkContent" FieldType="String" HeaderText="工作项" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
SortField="UnitName" FieldType="String" HeaderText="责任单位" TextAlign="center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="DutyPersonName" DataField="DutyPersonName"
SortField="DutyPersonName" FieldType="String" HeaderText="五环责任人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="95px" ColumnID="PlanDate" DataField="PlanDate" SortField="PlanDate"
FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd" HeaderText="计划完成时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="IsOKStr" DataField="IsOKStr"
SortField="IsOKStr" FieldType="String" HeaderText="完成状态" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="Remark" DataField="Remark"
SortField="Remark" FieldType="String" HeaderText="备注" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
</Columns>
</f:Grid>
</Items>
</f:Panel>
</form>
<script type="text/javascript">
// 点击标题栏工具图标 - 退出
function closeNow(event) {
var bConfirmed = confirm('您确定要退出吗?');
if (bConfirmed) { closePage(); }
}
function closePage() {
if (navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Chrome') !== -1) {
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}
</script>
</body>
</html>

186
SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.cs Normal file
View File

@ -0,0 +1,186 @@
using BLL;
using NPOI.SS.Formula.Functions;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
public partial class JDWeekDetail : PageBase
{
#region 项目主键
/// <summary>
/// 项目主键
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
public string WeekNo
{
get
{
return (string)ViewState["WeekNo"];
}
set
{
ViewState["WeekNo"] = value;
}
}
#endregion
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
this.ProjectId = this.CurrUser.LoginProjectId;
if (!string.IsNullOrEmpty(Request.Params["projectId"]) && Request.Params["projectId"] != this.CurrUser.LoginProjectId)
{
this.ProjectId = Request.Params["projectId"];
}
Model.SGGLDB db = Funs.DB;
var lastWeek = (from x in db.JDGL_WeekPlan where x.ProjectId == this.ProjectId && DateTime.Now > ((DateTime)x.EndDate).AddDays(1) orderby x.EndDate descending select x).FirstOrDefault();
this.WeekNo = lastWeek != null ? lastWeek.WeekNo : string.Empty;
this.InitDropDownList();
BindGrid();
}
}
/// <summary>
/// 初始化下拉框
/// </summary>
private void InitDropDownList()
{
WeekItemService.InitWeekItemDropDownList(this.drpWeekNo, this.ProjectId, false);
if (!string.IsNullOrWhiteSpace(this.WeekNo))
{
var item = WeekItemService.GetWeekItemByProjectIdAndWeekNo(this.ProjectId, int.Parse(this.WeekNo));
if (item != null)
{
this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
}
}
else
{
//获取当前时间所在周号，存在默认选中当前时间点所在周，否则选择最后一个周
var item = WeekItemService.GetWeekItemByDateNow(this.ProjectId);
if (item != null)
{//存在默认选中当前时间点所在周
this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
}
else
{
var items = WeekItemService.GetWeekItemList(this.ProjectId);
if (items.Any())
{//否则选择最后一个周
item = items.First();
this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
}
}
}
}
/// <summary>
/// 周号选择触发事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpWeekNo_SelectedIndexChanged(object sender, EventArgs e)
{
string weekNo = this.drpWeekNo.SelectedValue;
this.WeekNo = weekNo;
var item = BLL.WeekItemService.GetWeekItemByProjectIdAndWeekNo(this.ProjectId, int.Parse(weekNo));
if (item != null)
{
this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
}
BindGrid();
}
/// <summary>
/// 加载Grid
/// </summary>
private void BindGrid()
{
DataTable tb = BindData();
Grid1.RecordCount = tb.Rows.Count;
//tb = GetFilteredTable(Grid1.FilteredData, tb);
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
Grid1.DataBind();
}
/// <summary>
/// 加载数据
/// </summary>
/// <returns></returns>
private DataTable BindData()
{
string strSql = @"select mp.*,u.UnitName,uw.UnitWorkName,cn.ProfessionalName,case mp.IsOK when 1 then '已完成' when 0 then '未完成' else '' end as IsOKStr
,DutyPersonName = STUFF((SELECT ',' + p.UserName FROM dbo.Sys_User as p where PATINDEX('%,' + RTRIM(p.UserId) + ',%', ',' + mp.DutyPerson + ',') > 0 FOR XML PATH('')), 1, 1,'')
from [dbo].[JDGL_WeekPlan] mp
left join Base_Unit u on u.UnitId=mp.UnitId
left join WBS_UnitWork uw on uw.UnitWorkId=mp.UnitWork
left join Base_CNProfessional cn on cn.CNProfessionalId=mp.Major
where mp.ProjectId=@ProjectId and mp.WeekNo=@WeekNo order by mp.SortIndex";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
listStr.Add(new SqlParameter("@WeekNo", this.WeekNo));
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
return tb;
}
/// <summary>
/// 查询
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void TextBox2_TextChanged(object sender, EventArgs e)
{
this.BindGrid();
}
#region 表排序、分页、关闭窗口
/// <summary>
/// 分页
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
{
BindGrid();
}
/// <summary>
/// 排序
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
BindGrid();
}
#endregion
}
}

98
SGGL/FineUIPro.Web/DataShow/JDWeekDetail.aspx.designer.cs generated Normal file
View File

@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.DataShow
{
public partial class JDWeekDetail
{
/// <summary>
/// form1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel2;
/// <summary>
/// Grid1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// drpWeekNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpWeekNo;
/// <summary>
/// txtStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
}
}

5
SGGL/FineUIPro.Web/DataShow/License.aspx.cs
View File

@ -40,8 +40,11 @@ namespace FineUIPro.Web.DataShow
strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName,V.IsHighRisk
,V.WorkAreaName,V.CompileDate,V.StartDate,V.EndDate,V.WorkStatesStr,V.LicenseTypeId,V.UnitId,V.LicenseManageContents
,V.CompileMan,V.CompileDate,V.States,V.UserName
FROM View_License_LicenseManager AS V
FROM View_License_LicenseManager AS V
LEFT JOIN Base_Project AS Project ON V.ProjectId =Project.ProjectId
WHERE 1=1";
//在建项目数据
strSql += " AND (Project.ProjectState = '1' OR Project.ProjectState IS NULL)";
if (this.rbType.SelectedValue=="2")
{
strSql += " AND V.WorkStates = @WorkStates";

2
SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx.cs
View File

@ -41,6 +41,8 @@ namespace FineUIPro.Web.DataShow
LEFT JOIN Base_Unit AS Unit ON Person.UnitId =Unit.UnitId
LEFT JOIN Base_WorkPost AS WorkPost ON Person.WorkPostId =WorkPost.WorkPostId
WHERE IsUsed=1 AND InTime <=GETDATE() AND (OutTime IS NULL OR OutTime > GETDATE()) ";
//在建项目数据
strSql += " AND (Project.ProjectState = '1' OR Project.ProjectState IS NULL)";
List<SqlParameter> listStr = new List<SqlParameter>();
if (this.drpProject.SelectedValue !=Const._Null)
{

16
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -706,6 +706,8 @@
<Content Include="DataShow\HJGLWeldingItem.aspx" />
<Content Include="DataShow\InspectionManagement.aspx" />
<Content Include="DataShow\InspectionManagementItem.aspx" />
<Content Include="DataShow\JDWeekDetail.aspx" />
<Content Include="DataShow\JDMonthDetail.aspx" />
<Content Include="DataShow\JD.aspx" />
<Content Include="DataShow\LargeEngineering.aspx" />
<Content Include="DataShow\LargeEngineeringItem.aspx" />
@ -9352,6 +9354,20 @@
<Compile Include="DataShow\InspectionManagementItem.aspx.designer.cs">
<DependentUpon>InspectionManagementItem.aspx</DependentUpon>
</Compile>
<Compile Include="DataShow\JDWeekDetail.aspx.cs">
<DependentUpon>JDWeekDetail.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DataShow\JDWeekDetail.aspx.designer.cs">
<DependentUpon>JDWeekDetail.aspx</DependentUpon>
</Compile>
<Compile Include="DataShow\JDMonthDetail.aspx.cs">
<DependentUpon>JDMonthDetail.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="DataShow\JDMonthDetail.aspx.designer.cs">
<DependentUpon>JDMonthDetail.aspx</DependentUpon>
</Compile>
<Compile Include="DataShow\JD.aspx.cs">
<DependentUpon>JD.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>

22
SGGL/FineUIPro.Web/Global.asax.cs
View File

@ -69,17 +69,17 @@
{
ErrLogInfo.WriteLog("实名制同步定时器启动失败!", ex);
}
////根据考勤记录修改人员状态定时器
try
{
BLL.RealNameMonitorService.StartUpdateSitePerson();
// BLL.RealNameMonitorService.StartMonitorProject();
SynchroSetService.InsertRealNamePushLog(null, null, "根据考勤记录修改人员状态定时器开始启动", "sucess", "200", null, "成功", null);
}
catch (Exception ex)
{
ErrLogInfo.WriteLog("根据考勤记录修改人员状态定时器启动失败!", ex);
}
//////根据考勤记录修改人员状态定时器 此任务放入推送实名制定时任务中，同时操作人员表，导致死锁
//try
//{
// //BLL.RealNameMonitorService.StartUpdateSitePerson();
// // BLL.RealNameMonitorService.StartMonitorProject();
// //SynchroSetService.InsertRealNamePushLog(null, null, "根据考勤记录修改人员状态定时器开始启动", "sucess", "200", null, "成功", null);
//}
//catch (Exception ex)
//{
// ErrLogInfo.WriteLog("根据考勤记录修改人员状态定时器启动失败!", ex);
//}
///实名制出入记录去重
try
{

202
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx
View File

@ -9,106 +9,112 @@
</head>
<body>
<form id="form1" runat="server">
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="drpRegisterTypes" >
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="隐患级别" ID="dpRiskLevel" >
<f:ListItem Text="一般" Value="一般" Selected="true"/>
<f:ListItem Text="重大" Value="重大"/>
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="责任单位" ID="drpUnit"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_OnSelectedIndexChanged">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="单位工程" ID="drpWorkArea">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRegisterDef" runat="server" Label="问题描述" ShowRedStar="true" Required="true">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRequirements" runat="server" Label="整改要求" ShowRedStar="true" Required="true">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述" Hidden="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="责任人" ID="drpResponsibleMan" >
</f:DropDownList>
<f:DatePicker ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelAlign="Right" Required="True" ShowRedStar="true">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片" Text="上传和查看" OnClick="btnAttachUrl_Click" LabelAlign="Right">
</f:LinkButton>
<f:NumberBox ID="txtCutPayment" runat="server" Label="罚款金额" LabelAlign="Right" Text="0" NoNegative="true" NoDecimal="true"></f:NumberBox>
</Items>
</f:FormRow>
<f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<%-- <f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="检查项" ID="drpRegisterTypes">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="隐患级别" ID="dpRiskLevel">
<f:ListItem Text="一般事故隐患" Value="一般事故隐患" Selected="true" />
<f:ListItem Text="较大事故隐患" Value="较大事故隐患" />
<f:ListItem Text="重大事故隐患" Value="重大事故隐患" />
</f:DropDownList>
</Items>
</f:FormRow>--%>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="责任单位" ID="drpUnit"
AutoPostBack="true" OnSelectedIndexChanged="drpUnit_OnSelectedIndexChanged">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="单位工程" ID="drpWorkArea">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpHiddenType" runat="server" Label="隐患类型" EnableEdit="true" LabelAlign="Right" ShowRedStar="true"
Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false"
AutoPostBack="true" >
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRegisterDef" runat="server" Label="隐患内容" ShowRedStar="true" Required="true">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRequirements" runat="server" Label="整改要求" ShowRedStar="true" Required="true">
</f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox runat="server" ID="txtHandleIdea" Label="复检问题描述" Hidden="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="责任人" ID="drpResponsibleMan">
</f:DropDownList>
<f:DatePicker ID="txtRectificationPeriod" runat="server" Label="整改期限" LabelAlign="Right" Required="True" ShowRedStar="true">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtCheckManName" runat="server" Label="检查人" Readonly="true">
</f:TextBox>
<f:TextBox ID="txtCheckTime" runat="server" Label="检查时间" Readonly="true">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:LinkButton ID="UploadAttach" runat="server" Label="整改前照片" Text="上传和查看" OnClick="btnAttachUrl_Click" LabelAlign="Right">
</f:LinkButton>
<f:NumberBox ID="txtCutPayment" runat="server" Label="罚款金额" LabelAlign="Right" Text="0" NoNegative="true" NoDecimal="true"></f:NumberBox>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:RadioButtonList ID="ckType" runat="server" Label="巡检周期"
Width="330px" Hidden="true">
<f:RadioItem Value="D" Selected="True" Text="日检" />
<f:RadioItem Value="W" Text="周检" />
<f:RadioItem Value="M" Text="月检" />
</f:RadioButtonList>
<f:HiddenField ID="hdCheckManId" runat="server"></f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="Window1" Title="文件上传" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="680px"
Height="480px">
</f:Window>
<f:FormRow>
<Items>
<f:DropDownList ID="drpHiddenType" runat="server" Label="隐患类型" EnableEdit="true" LabelAlign="Right" ShowRedStar="true"
Required="true" EmptyText="--请选择--" AutoSelectFirstItem="false"
AutoPostBack="true">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" Label="隐患级别" ID="dpRiskLevel">
<f:ListItem Text="一般事故隐患" Value="一般事故隐患" Selected="true" />
<f:ListItem Text="较大事故隐患" Value="较大事故隐患" />
<f:ListItem Text="重大事故隐患" Value="重大事故隐患" />
</f:DropDownList>
</Items>
</f:FormRow>
</Rows>
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
<Items>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:RadioButtonList ID="ckType" runat="server" Label="巡检周期"
Width="330px" Hidden="true">
<f:RadioItem Value="D" Selected="True" Text="日检" />
<f:RadioItem Value="W" Text="周检" />
<f:RadioItem Value="M" Text="月检" />
</f:RadioButtonList>
<f:HiddenField ID="hdCheckManId" runat="server"></f:HiddenField>
<f:Button ID="btnSave" Icon="SystemSave" runat="server" ValidateForms="SimpleForm1"
OnClick="btnSave_Click">
</f:Button>
<f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" runat="server" Icon="SystemClose">
</f:Button>
</Items>
</f:Toolbar>
</Toolbars>
</f:Form>
<f:Window ID="Window1" Title="文件上传" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="680px"
Height="480px">
</f:Window>
</form>
</body>
</html>

32
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.cs
View File

@ -90,19 +90,19 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
UnitWorkService.InitUnitWorkDownList(this.drpWorkArea, this.CurrUser.LoginProjectId, true);
UserService.InitUserProjectIdUnitTypeDropDownList(this.drpResponsibleMan, this.CurrUser.LoginProjectId, Const.ProjectUnitType_2, true);
this.drpRegisterTypes.DataTextField = "RegisterTypesName";
this.drpRegisterTypes.DataValueField = "RegisterTypesId";
if (Type=="1")
{
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("4"); //安全巡检类型
//this.drpRegisterTypes.DataTextField = "RegisterTypesName";
//this.drpRegisterTypes.DataValueField = "RegisterTypesId";
//if (Type=="1")
//{
// this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("4"); //安全巡检类型
}
else
{
this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型
//}
//else
//{
// this.drpRegisterTypes.DataSource = BLL.HSSE_Hazard_HazardRegisterTypesService.GetHazardRegisterTypesList("1"); //安全巡检类型
}
this.drpRegisterTypes.DataBind();
//}
//this.drpRegisterTypes.DataBind();
this.HazardRegisterId = Request.Params["HazardRegisterId"];
//新增初始化
this.txtCheckManName.Text = this.CurrUser.UserName;
@ -132,10 +132,10 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
this.drpWorkArea.SelectedValue = registration.Place;
}
if (!string.IsNullOrEmpty(registration.RegisterTypesId))
{
this.drpRegisterTypes.SelectedValue = registration.RegisterTypesId;
}
//if (!string.IsNullOrEmpty(registration.RegisterTypesId))
//{
// this.drpRegisterTypes.SelectedValue = registration.RegisterTypesId;
//}
if (!string.IsNullOrEmpty(registration.CheckCycle))
{
this.ckType.SelectedValue = registration.CheckCycle;
@ -245,7 +245,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
Model.HSSE_Hazard_HazardRegister register = new Model.HSSE_Hazard_HazardRegister();
register.ProjectId = this.CurrUser.LoginProjectId;
register.ProblemTypes = "1"; //安全隐患问题
register.RegisterTypesId = this.drpRegisterTypes.SelectedValue;
//register.RegisterTypesId = this.drpRegisterTypes.SelectedValue;
register.CheckCycle = this.ckType.SelectedValue;
register.Risk_Level = this.dpRiskLevel.SelectedText;
register.IsEffective = "1";

27
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationAdd.aspx.designer.cs generated
View File

@ -41,24 +41,6 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// drpRegisterTypes 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpRegisterTypes;
/// <summary>
/// dpRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dpRiskLevel;
/// <summary>
/// drpUnit 控件。
/// </summary>
@ -167,6 +149,15 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// </remarks>
protected global::FineUIPro.DropDownList drpHiddenType;
/// <summary>
/// dpRiskLevel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dpRiskLevel;
/// <summary>
/// Toolbar1 控件。
/// </summary>

108
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx
View File

@ -25,9 +25,9 @@
<f:TextBox runat="server" Label="检查人" ID="txtCheckMan" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:TextBox>
<f:TextBox runat="server" Label="检查项" ID="txtType" EmptyText="输入查询条件" AutoPostBack="true"
<%--<f:TextBox runat="server" Label="检查项" ID="txtType" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:TextBox>
</f:TextBox>--%>
<f:TextBox runat="server" Label="单位工程" ID="txtWorkAreaName" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="210px" LabelWidth="80px">
</f:TextBox>
@ -35,6 +35,15 @@
AutoPostBack="true" OnTextChanged="TextBox_TextChanged" LabelAlign="right" Width="250px"
LabelWidth="80px">
</f:TextBox>
<f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" LabelAlign="Right" Label="级别" ID="dpRiskLevel" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:ListItem Text="-请选择-" Value="" />
<f:ListItem Text="一般事故隐患" Value="一般事故隐患" />
<f:ListItem Text="较大事故隐患" Value="较大事故隐患" />
<f:ListItem Text="重大事故隐患" Value="重大事故隐患" />
</f:DropDownList>
</Items>
</f:Toolbar>
</Toolbars>
@ -57,14 +66,6 @@
<f:DatePicker ID="txtEndRectificationTime" runat="server" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="130px">
</f:DatePicker>
<f:DropDownList ID="drpStates" runat="server" Label="状态" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged"
LabelWidth="70px" LabelAlign="Right" Width="170px">
</f:DropDownList>
<f:DropDownList runat="server" EnableSimulateTree="True" LabelAlign="Right" Label="级别" ID="dpRiskLevel" AutoPostBack="true" OnSelectedIndexChanged="TextBox_TextChanged">
<f:ListItem Text="-请选择-" Value=""/>
<f:ListItem Text="一般" Value="一般"/>
<f:ListItem Text="重大" Value="重大"/>
</f:DropDownList>
<f:ToolbarFill ID="ToolbarFill1" runat="server">
</f:ToolbarFill>
<f:HiddenField runat="server" ID="hdRemark">
@ -86,16 +87,63 @@
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="150px" ColumnID="CheckTime" DataField="CheckTime" SortField="CheckTime"
HeaderText="检查时间" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="200px" ColumnID="RegisterDef" DataField="RegisterDef" SortField="RegisterDef"
FieldType="String" HeaderText="隐患内容" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WorkAreaName" DataField="WorkAreaName" SortField="WorkAreaName"
FieldType="String" HeaderText="区域" TextAlign="Left" HeaderTextAlign="Center">
<f:RenderField Width="150px" ColumnID="CheckTime" DataField="CheckTime" SortField="CheckTime"
HeaderText="检查时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="HiddenType" DataField="HiddenType"
FieldType="String" HeaderText="隐患类型" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Risk_Level" DataField="Risk_Level"
SortField="Risk_Level" FieldType="String" HeaderText="隐患级别" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="ResponsibilityUnitName" DataField="ResponsibilityUnitName"
SortField="ResponsibilityUnitName" FieldType="String" HeaderText="责任单位" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ResponsibilityManName" DataField="ResponsibilityManName"
SortField="ResponsibilityManName" FieldType="String" HeaderText="责任人" TextAlign="Center"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="RectificationPeriod" DataField="RectificationPeriod"
SortField="RectificationPeriod" FieldType="Date" Renderer="Date" HeaderText="整改期限"
TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Requirements" DataField="Requirements" SortField="Requirements"
FieldType="String" HeaderText="整改要求" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="ConfirmStr" DataField="ConfirmStr" SortField="ConfirmStr"
FieldType="String" HeaderText="复查结果" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ConfirmDate" DataField="ConfirmDate" SortField="ConfirmDate"
FieldType="String" HeaderText="复查日期" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ConfirmManName" DataField="ConfirmManName" SortField="ConfirmManName"
FieldType="String" HeaderText="复查人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="StatesStr" DataField="StatesStr" SortField="StatesStr"
FieldType="String" HeaderText="隐患状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="RectificationTime" DataField="RectificationTime"
SortField="RectificationTime" HeaderText="整改时间" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
FieldType="String" HeaderText="检查人" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Rectification" DataField="Rectification" SortField="Rectification"
FieldType="String" HeaderText="采取措施" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="RegisterTypesName" DataField="RegisterTypesName"
SortField="RegisterTypesName" FieldType="String" HeaderText="问题类型" TextAlign="Left"
SortField="RegisterTypesName" FieldType="String" HeaderText="检查项" TextAlign="Center" Hidden="true"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WorkAreaName" DataField="WorkAreaName" SortField="WorkAreaName"
FieldType="String" HeaderText="区域" TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:TemplateField ColumnID="tfImageUrl1" Width="120px" HeaderText="整改前" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>
@ -108,36 +156,6 @@
<asp:Label ID="Label2" runat="server" Text='<%# ConvertImgUrlByImage(Eval("HazardRegisterId")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="200px" ColumnID="RegisterDef" DataField="RegisterDef" SortField="RegisterDef"
FieldType="String" HeaderText="问题描述" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="Requirements" DataField="Requirements" SortField="Requirements"
FieldType="String" HeaderText="整改要求" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="Rectification" DataField="Rectification" SortField="Rectification"
FieldType="String" HeaderText="采取措施" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="200px" ColumnID="ResponsibilityUnitName" DataField="ResponsibilityUnitName"
SortField="ResponsibilityUnitName" FieldType="String" HeaderText="责任单位" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="ResponsibilityManName" DataField="ResponsibilityManName"
SortField="ResponsibilityManName" FieldType="String" HeaderText="责任人" TextAlign="Left"
HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="RectificationPeriod" DataField="RectificationPeriod"
SortField="RectificationPeriod" FieldType="Date" Renderer="Date" HeaderText="整改期限"
TextAlign="Center" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="150px" ColumnID="RectificationTime" DataField="RectificationTime"
SortField="RectificationTime" HeaderText="整改时间" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="CheckManName" DataField="CheckManName" SortField="CheckManName"
FieldType="String" HeaderText="检查人" TextAlign="Left" HeaderTextAlign="Center">
</f:RenderField>
<f:RenderField Width="90px" ColumnID="StatesStr" DataField="StatesStr" SortField="StatesStr"
FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<%--<f:TemplateField ColumnID="tfImageUrl" Width="280px" HeaderText="整改前图片" HeaderTextAlign="Center"
TextAlign="Left">
<ItemTemplate>

37
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.cs
View File

@ -29,17 +29,17 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// <summary>
/// 巡检类型 0 日常 1 常规
/// </summary>
public string Type
{
public string Type
{
get
{
return (string )ViewState["Type"];
return (string)ViewState["Type"];
}
set
set
{
ViewState["Type"] = value;
}
}
}
#endregion
@ -90,11 +90,11 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
strSql += " AND CheckManName LIKE @CheckMan";
listStr.Add(new SqlParameter("@CheckMan", "%" + this.txtCheckMan.Text.Trim() + "%"));
}
if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
{
strSql += " AND RegisterTypesName LIKE @Type";
listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
}
//if (!string.IsNullOrEmpty(this.txtType.Text.Trim()))
//{
// strSql += " AND RegisterTypesName LIKE @Type";
// listStr.Add(new SqlParameter("@Type", "%" + this.txtType.Text.Trim() + "%"));
//}
if (!string.IsNullOrEmpty(this.txtWorkAreaName.Text.Trim()))
{
strSql += " AND WorkAreaName LIKE @WorkAreaName";
@ -149,7 +149,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
Grid1.RecordCount = tb.Rows.Count;
var table = this.GetPagedDataTable(Grid1, tb);
Grid1.DataSource = table;
@ -175,7 +175,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Grid1_Sort(object sender, GridSortEventArgs e)
{
{
BindGrid();
}
@ -256,7 +256,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (registration.CheckManId == this.CurrUser.UserId) //当前人是检查人，可以在整改前继续编辑
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}&&Type={1}", RegistrationId,Type, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?HazardRegisterId={0}&&Type={1}", RegistrationId, Type, "编辑 - ")));
}
else
{
@ -371,7 +371,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnAdd))
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?Type={0}",Type, "登记 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HiddenRectificationAdd.aspx?Type={0}", Type, "登记 - ")));
}
else
{
@ -418,7 +418,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
if (getD != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, getD.HazardCode, getD.HazardRegisterId, BLL.Const.HSSE_HiddenRectificationListMenuId, BLL.Const.BtnDelete);
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(RegistrationId);
BLL.HSSE_Hazard_HazardRegisterService.DeleteHazardRegisterByHazardRegisterId(RegistrationId);
BindGrid();
ShowNotify("删除成功!", MessageBoxIcon.Success);
}
@ -470,6 +470,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
#endregion
#region 格式化字符串
/// <summary>
/// 获取整改前图片
/// </summary>
@ -640,7 +641,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
this.BindGrid();
}
#endregion
/// <summary>
///
/// </summary>
@ -659,7 +660,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
hazardRegisterIds = hazardRegisterIds.Substring(0, hazardRegisterIds.LastIndexOf(","));
}
// PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("HiddenRectificationPrint.aspx?HazardRegisterIds={0}&CheckType={1}", hazardRegisterIds,"0", "查看 - ")));
// PageContext.RegisterStartupScript(Window4.GetShowReference(String.Format("HiddenRectificationPrint.aspx?HazardRegisterIds={0}&CheckType={1}", hazardRegisterIds,"0", "查看 - ")));
this.hdRemark.Text = string.Empty;
//}
}

203
SGGL/FineUIPro.Web/HSSE/HiddenInspection/HiddenRectificationList.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HSSE.HiddenInspection {
public partial class HiddenRectificationList {
namespace FineUIPro.Web.HSSE.HiddenInspection
{
public partial class HiddenRectificationList
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// Panel1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Panel Panel1;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Toolbar1 控件。
/// </summary>
@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar1;
/// <summary>
/// txtCheckMan 控件。
/// </summary>
@ -65,16 +67,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCheckMan;
/// <summary>
/// txtType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtType;
/// <summary>
/// txtWorkAreaName 控件。
/// </summary>
@ -83,7 +76,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWorkAreaName;
/// <summary>
/// txtResponsibilityUnitName 控件。
/// </summary>
@ -92,70 +85,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtResponsibilityUnitName;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtStartTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// txtStartRectificationTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartRectificationTime;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndRectificationTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndRectificationTime;
/// <summary>
/// drpStates 控件。
/// </summary>
@ -164,7 +94,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// dpRiskLevel 控件。
/// </summary>
@ -173,7 +103,70 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList dpRiskLevel;
/// <summary>
/// Toolbar2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtStartTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartTime;
/// <summary>
/// Label3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label3;
/// <summary>
/// txtEndTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndTime;
/// <summary>
/// txtStartRectificationTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartRectificationTime;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label Label1;
/// <summary>
/// txtEndRectificationTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndRectificationTime;
/// <summary>
/// ToolbarFill1 控件。
/// </summary>
@ -182,7 +175,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarFill ToolbarFill1;
/// <summary>
/// hdRemark 控件。
/// </summary>
@ -191,7 +184,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdRemark;
/// <summary>
/// btnNew 控件。
/// </summary>
@ -200,7 +193,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnNew;
/// <summary>
/// btnOut 控件。
/// </summary>
@ -209,7 +202,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnOut;
/// <summary>
/// lblPageIndex 控件。
/// </summary>
@ -218,7 +211,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblPageIndex;
/// <summary>
/// lbImageUrl 控件。
/// </summary>
@ -227,7 +220,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl;
/// <summary>
/// Label2 控件。
/// </summary>
@ -236,7 +229,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -245,7 +238,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
/// <summary>
/// ToolbarText1 控件。
/// </summary>
@ -254,7 +247,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ToolbarText ToolbarText1;
/// <summary>
/// ddlPageSize 控件。
/// </summary>
@ -263,7 +256,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlPageSize;
/// <summary>
/// Window1 控件。
/// </summary>
@ -272,7 +265,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window1;
/// <summary>
/// Window2 控件。
/// </summary>
@ -281,7 +274,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window2;
/// <summary>
/// Window3 控件。
/// </summary>
@ -290,7 +283,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Window Window3;
/// <summary>
/// Menu1 控件。
/// </summary>
@ -299,7 +292,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Menu Menu1;
/// <summary>
/// btnModify 控件。
/// </summary>
@ -308,7 +301,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnModify;
/// <summary>
/// btnRectify 控件。
/// </summary>
@ -317,7 +310,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnRectify;
/// <summary>
/// btnConfirm 控件。
/// </summary>
@ -326,7 +319,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnConfirm;
/// <summary>
/// btnMenuSee 控件。
/// </summary>
@ -335,7 +328,7 @@ namespace FineUIPro.Web.HSSE.HiddenInspection {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.MenuButton btnMenuSee;
/// <summary>
/// btnMenuDelete 控件。
/// </summary>

9
SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx
View File

@ -49,7 +49,8 @@
<f:RadioButtonList ID="rblState" runat="server" Label="分析类型" LabelWidth="80px" Width="250px"
AutoPostBack="true" OnSelectedIndexChanged="drpChartType_SelectedIndexChanged">
<f:RadioItem Value="0" Selected="true" Text="按责任单位" />
<f:RadioItem Value="1" Text="按检查项" />
<f:RadioItem Value="1" Text="按隐患类型" />
<%--<f:RadioItem Value="1" Text="按检查项" />--%>
</f:RadioButtonList>
<f:Label ID="aa" runat="server">
</f:Label>
@ -62,11 +63,11 @@
<f:Panel ID="Panel4" CssClass="blockpanel" runat="server" EnableCollapse="false"
BodyPadding="10px" ShowBorder="true" ShowHeader="false">
<Items>
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="360px" ShowBorder="true"
<f:TabStrip ID="TabStrip1" CssClass="f-tabstrip-theme-simple" Height="360px" ShowBorder="true"
TabPosition="Top" MarginBottom="5px" EnableTabCloseMenu="false" runat="server">
<Tabs>
<f:Tab ID="Tab2" Title="按类别" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="按类别统计">
<f:Tab ID="Tab2" Title="统计结果" BodyPadding="5px" Layout="Fit" IconFont="Bookmark" runat="server"
TitleToolTip="统计结果">
<Items>
<f:ContentPanel ShowHeader="false" runat="server" ID="cpAccidentTime" Margin="0 0 0 0">
<div id="divAccidentTime">

69
SGGL/FineUIPro.Web/HSSE/HiddenInspection/RiskAnalysisChart.aspx.cs
View File

@ -98,23 +98,24 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
}
else
{
#region 按检查项
#region 按隐患类型
var types = from x in Funs.DB.Sys_Const where x.GroupId == "Hiddendangertype" orderby x.SortIndex select x;
if (this.drpChartType.SelectedValue != "Pie") //非饼形图
{
///按检查项
///按隐患类型
DataTable dtTime = new DataTable();
dtTime.Columns.Add("检查项", typeof(string));
dtTime.Columns.Add("隐患类型", typeof(string));
dtTime.Columns.Add("总数量", typeof(string));
dtTime.Columns.Add("待整改", typeof(string));
dtTime.Columns.Add("已整改", typeof(string));
var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
foreach (var item in types)
{
DataRow rowTime = dtTime.NewRow();
Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
rowTime["检查项"] = item.RegisterTypesName;
var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
rowTime["隐患类型"] = item.ConstValue;
var typeHazad = hazardRegisters.Where(x => x.HiddenType == item.ConstValue);
rowTime["总数量"] = typeHazad.Count();
rowTime["待整改"] = typeHazad.Where(x => x.States == "1" || x.States == null).Count();
rowTime["已整改"] = typeHazad.Where(x => x.States == "3" || x.States == "2").Count();
@ -127,22 +128,70 @@ namespace FineUIPro.Web.HSSE.HiddenInspection
{
///按问题类型
DataTable dtTime = new DataTable();
dtTime.Columns.Add("检查项", typeof(string));
dtTime.Columns.Add("隐患类型", typeof(string));
dtTime.Columns.Add("总数量", typeof(string));
var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
foreach (var item in types)
{
DataRow rowTime = dtTime.NewRow();
Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
rowTime["检查项"] = item.RegisterTypesName;
var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
rowTime["隐患类型"] = item.ConstValue;
var typeHazad = hazardRegisters.Where(x => x.HiddenType == item.ConstValue);
rowTime["总数量"] = typeHazad.Count();
dtTime.Rows.Add(rowTime);
}
this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
}
#endregion
#region 按检查项
//if (this.drpChartType.SelectedValue != "Pie") //非饼形图
//{
// ///按检查项
// DataTable dtTime = new DataTable();
// dtTime.Columns.Add("检查项", typeof(string));
// dtTime.Columns.Add("总数量", typeof(string));
// dtTime.Columns.Add("待整改", typeof(string));
// dtTime.Columns.Add("已整改", typeof(string));
// var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
// foreach (var item in types)
// {
// DataRow rowTime = dtTime.NewRow();
// Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
// rowTime["检查项"] = item.RegisterTypesName;
// var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
// rowTime["总数量"] = typeHazad.Count();
// rowTime["待整改"] = typeHazad.Where(x => x.States == "1" || x.States == null).Count();
// rowTime["已整改"] = typeHazad.Where(x => x.States == "3" || x.States == "2").Count();
// dtTime.Rows.Add(rowTime);
// }
// this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
//}
//else //饼形图
//{
// ///按问题类型
// DataTable dtTime = new DataTable();
// dtTime.Columns.Add("检查项", typeof(string));
// dtTime.Columns.Add("总数量", typeof(string));
// var types = from x in Funs.DB.HSSE_Hazard_HazardRegisterTypes where x.HazardRegisterType == "1" orderby x.TypeCode select x;
// foreach (var item in types)
// {
// DataRow rowTime = dtTime.NewRow();
// Model.SpTDesktopItem newspItem = new Model.SpTDesktopItem();
// rowTime["检查项"] = item.RegisterTypesName;
// var typeHazad = hazardRegisters.Where(x => x.RegisterTypesId == item.RegisterTypesId);
// rowTime["总数量"] = typeHazad.Count();
// dtTime.Rows.Add(rowTime);
// }
// this.ChartAccidentTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtTime, "巡检问题分析", this.drpChartType.SelectedValue, 1100, 330, this.ckbShow.Checked));
//}
#endregion
}
}

2
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx
View File

@ -64,7 +64,7 @@
<Items>
<f:Panel ID="Panel2" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
<Items>
<f:Label ID="Label1" runat="server" Label="附件1-论证后的方案"
<f:Label ID="Label1" runat="server" Label="附件1-专项方案"
LabelAlign="Right" LabelWidth="180px">
</f:Label>
<f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttachUrl_Click">

62
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardEdit.aspx.cs
View File

@ -111,7 +111,7 @@ namespace FineUIPro.Web.HSSE.Solution
// this.txtLargerHazardCode.Text = BLL.CodeRecordsService.ReturnCodeByMenuIdProjectId(BLL.Const.ProjectLargerHazardListMenuId, this.ProjectId, this.CurrUser.UnitId);
this.txtExpectedTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtRemark.Text = HttpUtility.HtmlDecode("描述");
this.txtRecordTime.Text = string.Format("{0:yyyy-MM-dd}",DateTime.Now);
this.txtRecordTime.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
}
}
}
@ -135,26 +135,29 @@ namespace FineUIPro.Web.HSSE.Solution
//判断附件是否必传
if (!returnFj(this.HazardId + "_1"))
{
Alert.ShowInTop("请上传附件1-论证后的方案", MessageBoxIcon.Warning);
Alert.ShowInTop("请上传附件1-专项方案", MessageBoxIcon.Warning);
return;
}
if (!returnFj(this.HazardId + "_2"))
if (Convert.ToBoolean(this.rblIsArgument.SelectedValue) && Convert.ToBoolean(this.rblIsSuperLargerHazard.SelectedValue))
{
Alert.ShowInTop("请上传附件2-专家论证报告", MessageBoxIcon.Warning);
return;
}
if (!returnFj(this.HazardId + "_2"))
{
Alert.ShowInTop("请上传附件2-专家论证报告", MessageBoxIcon.Warning);
return;
}
if (!returnFj(this.HazardId + "_3"))
{
Alert.ShowInTop("请上传附件3-论证会签到表", MessageBoxIcon.Warning);
return;
}
if (!returnFj(this.HazardId + "_3"))
{
Alert.ShowInTop("请上传附件3-论证会签到表", MessageBoxIcon.Warning);
return;
}
if (!returnFj(this.HazardId + "_4"))
{
Alert.ShowInTop("请上传附件4-论证会会议照片", MessageBoxIcon.Warning);
return;
if (!returnFj(this.HazardId + "_4"))
{
Alert.ShowInTop("请上传附件4-论证会会议照片", MessageBoxIcon.Warning);
return;
}
}
if (!returnFj(this.HazardId + "_5"))
@ -189,7 +192,7 @@ namespace FineUIPro.Web.HSSE.Solution
ExpectedTime = Funs.GetNewDateTime(this.txtExpectedTime.Text.Trim()),
IsArgument = Convert.ToBoolean(this.rblIsArgument.SelectedValue),
IsSuperLargerHazard = Convert.ToBoolean(this.rblIsSuperLargerHazard.SelectedValue),
TrainPersonNum=Funs.GetNewIntOrZero(this.txtTrainPersonNum.Text.Trim()),
TrainPersonNum = Funs.GetNewIntOrZero(this.txtTrainPersonNum.Text.Trim()),
Remark = HttpUtility.HtmlEncode(this.txtRemark.Text.Trim()),
Descriptions = this.txtDescriptions.Text.Trim(),
RecordTime = Funs.GetNewDateTime(this.txtRecordTime.Text.Trim()),
@ -200,7 +203,7 @@ namespace FineUIPro.Web.HSSE.Solution
{
largerHazard.HazardId = this.HazardId;
BLL.LargerHazardService.UpdateLargerHazard(largerHazard);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId,BLL.Const.ProjectLargerHazardListMenuId,BLL.Const.BtnModify);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnModify);
}
else
{
@ -208,7 +211,7 @@ namespace FineUIPro.Web.HSSE.Solution
largerHazard.RecardMan = this.CurrUser.UserId;
this.HazardId = largerHazard.HazardId;
BLL.LargerHazardService.AddLargerHazard(largerHazard);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnAdd);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnAdd);
}
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.ProjectInformation);
Project_HSSEData_HSSEService.StatisticalData(this.CurrUser.LoginProjectId, Project_HSSEData_HSSEService.HSSEDateType.DangerousProject);
@ -230,9 +233,9 @@ namespace FineUIPro.Web.HSSE.Solution
//菜单id和质量危大保持一致
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format(
"../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}",
this.HazardId+"_1", BLL.Const.MajorPlanApprovalMenuId)));
this.HazardId + "_1", BLL.Const.MajorPlanApprovalMenuId)));
}
protected void btnAttach_Click2(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.HazardId))
@ -242,7 +245,7 @@ namespace FineUIPro.Web.HSSE.Solution
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format(
"../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}",
this.HazardId+"_2", BLL.Const.MajorPlanApprovalMenuId)));
this.HazardId + "_2", BLL.Const.MajorPlanApprovalMenuId)));
}
protected void btnAttach_Click3(object sender, EventArgs e)
@ -254,7 +257,7 @@ namespace FineUIPro.Web.HSSE.Solution
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format(
"../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}",
this.HazardId+"_3", BLL.Const.MajorPlanApprovalMenuId)));
this.HazardId + "_3", BLL.Const.MajorPlanApprovalMenuId)));
}
protected void btnAttach_Click4(object sender, EventArgs e)
@ -266,7 +269,7 @@ namespace FineUIPro.Web.HSSE.Solution
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format(
"../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}",
this.HazardId+"_4", BLL.Const.MajorPlanApprovalMenuId)));
this.HazardId + "_4", BLL.Const.MajorPlanApprovalMenuId)));
}
protected void btnAttach_Click5(object sender, EventArgs e)
@ -278,7 +281,7 @@ namespace FineUIPro.Web.HSSE.Solution
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format(
"../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}",
this.HazardId+"_5", BLL.Const.MajorPlanApprovalMenuId)));
this.HazardId + "_5", BLL.Const.MajorPlanApprovalMenuId)));
}
protected void btnAttach_Click6(object sender, EventArgs e)
@ -290,13 +293,14 @@ namespace FineUIPro.Web.HSSE.Solution
PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format(
"../../AttachFile/webuploader.aspx?type=0&toKeyId={0}&path=FileUpload/CQMS/MajorPlanApproval&menuId={1}",
this.HazardId+"_6", BLL.Const.MajorPlanApprovalMenuId)));
this.HazardId + "_6", BLL.Const.MajorPlanApprovalMenuId)));
}
private bool returnFj(string id) {
private bool returnFj(string id)
{
bool isT = true;
var model = Funs.DB.AttachFile.FirstOrDefault(x => x.ToKeyId == id);
if (model==null)
if (model == null)
{
return false;
}
@ -323,7 +327,7 @@ namespace FineUIPro.Web.HSSE.Solution
};
this.HazardId = largerHazard.HazardId;
BLL.LargerHazardService.AddLargerHazard(largerHazard);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId,BLL.Const.ProjectLargerHazardListMenuId,BLL.Const.BtnAdd);
BLL.LogService.AddSys_Log(this.CurrUser, largerHazard.HazardCode, largerHazard.HazardId, BLL.Const.ProjectLargerHazardListMenuId, BLL.Const.BtnAdd);
}
}
}

2
SGGL/FineUIPro.Web/HSSE/Solution/LargerHazardList.aspx
View File

@ -125,7 +125,7 @@
</f:Panel>
<f:Window ID="Window1" Title="编辑危险性较大的工程清单" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1000px" Height="500px">
Width="1000px" Height="600px">
</f:Window>
<f:Menu ID="Menu1" runat="server">
<Items>

35
SGGL/FineUIPro.Web/JDGL/Check/MonthPlanIn.aspx.cs
View File

@ -233,10 +233,14 @@ namespace FineUIPro.Web.JDGL.Check
}
else
{
var user = projectUsers.FirstOrDefault(e => e.UserName == col3);
if (user == null)
var lstUser = col3.Split(',');
foreach (var obj in lstUser)
{
result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + col3 + "]不在项目用户信息中！" + "|";
var user = projectUsers.FirstOrDefault(x => x.UserName == obj);
if (user == null)
{
result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + obj + "]不在项目用户信息中！" + "|";
}
}
}
@ -410,13 +414,19 @@ namespace FineUIPro.Web.JDGL.Check
MonthPlan.PlanDate = Funs.GetNewDateTime(col2);
}
if (!string.IsNullOrEmpty(col3))//计划完成
if (!string.IsNullOrEmpty(col3))//五环责任人
{
var projectUser = projectUsers.FirstOrDefault(x => x.UserName == col3);
if (projectUser != null)
var lstUser = col3.Split(',');
var lstUserIds = string.Empty;
foreach (var obj in lstUser)
{
MonthPlan.DutyPerson = projectUser.UserId;
var projectUser = projectUsers.FirstOrDefault(x => x.UserName == obj);
if (projectUser != null)
{
lstUserIds = !string.IsNullOrWhiteSpace(lstUserIds) ? $"{lstUserIds},{projectUser.UserId}" : projectUser.UserId;
}
}
MonthPlan.DutyPerson = lstUserIds;
}
if (!string.IsNullOrEmpty(col4))//实际完成时间
{
@ -608,7 +618,16 @@ namespace FineUIPro.Web.JDGL.Check
string name = string.Empty;
if (DutyPerson != null)
{
name = BLL.UserService.GetUserNameByUserId(DutyPerson.ToString());
var lstUser = DutyPerson.ToString().Split(',');
var lstUserIds = string.Empty;
foreach (var obj in lstUser)
{
var username = BLL.UserService.GetUserNameByUserId(obj);
if (username != null)
{
name = !string.IsNullOrWhiteSpace(name) ? $"{name},{username}" : username;
}
}
}
return name;
}

7
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx
View File

@ -15,11 +15,12 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:TextBox runat="server" ID="txtWeekNo" ShowRedStar="true" Required="true" Label="周号" LabelAlign="Right"></f:TextBox>
<f:DatePicker ID="txtStartDate" runat="server" ShowRedStar="true" Required="true" Label="开始日期" LabelAlign="Right"
<%--<f:TextBox runat="server" ID="txtWeekNo" ShowRedStar="true" Required="true" Label="周号" LabelAlign="Right"></f:TextBox>--%>
<f:DropDownList runat="server" ID="drpWeekNo" Label="周号" LabelAlign="Right" LabelWidth="80px" AutoPostBack="true" OnSelectedIndexChanged="drpWeekNo_SelectedIndexChanged"></f:DropDownList>
<f:DatePicker ID="txtStartDate" runat="server" ShowRedStar="true" Readonly="true" Label="开始日期" LabelAlign="Right"
EnableEdit="true" >
</f:DatePicker>
<f:DatePicker ID="txtEndDate" runat="server" ShowRedStar="true" Required="true" Label="结束日期" LabelAlign="Right"
<f:DatePicker ID="txtEndDate" runat="server" ShowRedStar="true" Readonly="true" Label="结束日期" LabelAlign="Right"
EnableEdit="true" >
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>

87
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx.cs
View File

@ -1,4 +1,5 @@
using BLL;
using FineUIPro.Web.ProjectData;
using System;
using System.Collections.Generic;
using System.Data;
@ -55,6 +56,7 @@ namespace FineUIPro.Web.JDGL.Check
{
this.hdFileName.Text = string.Empty;
this.hdCheckResult.Text = string.Empty;
this.InitDropDownList();
if (WeekPlans != null)
{
WeekPlans.Clear();
@ -63,8 +65,52 @@ namespace FineUIPro.Web.JDGL.Check
this.ProjectId = Request.Params["ProjectId"];
}
}
/// <summary>
/// 初始化下拉框
/// </summary>
private void InitDropDownList()
{
WeekItemService.InitWeekItemDropDownList(this.drpWeekNo, this.CurrUser.LoginProjectId, false);
//获取当前时间所在周号，存在默认选中当前时间点所在周，否则选择最后一个周
var item = WeekItemService.GetWeekItemByDateNow(this.CurrUser.LoginProjectId);
if (item != null)
{//存在默认选中当前时间点所在周
this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
}
else
{
var items = WeekItemService.GetWeekItemList(this.CurrUser.LoginProjectId);
if (items.Any())
{//否则选择最后一个周
item = items.First();
this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
}
}
}
#endregion
/// <summary>
/// 周号选择触发事件
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void drpWeekNo_SelectedIndexChanged(object sender, EventArgs e)
{
var weekNo = this.drpWeekNo.SelectedValue;
var item = BLL.WeekItemService.GetWeekItemByProjectIdAndWeekNo(this.CurrUser.LoginProjectId, int.Parse(weekNo));
if (item != null)
{
this.drpWeekNo.SelectedValue = item.WeekNo.ToString();
this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", item.StartDate);
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", item.EndDate);
}
}
#region 审核
/// <summary>
/// 审核
@ -246,10 +292,14 @@ namespace FineUIPro.Web.JDGL.Check
}
else
{
var user = projectUsers.FirstOrDefault(e => e.UserName == col4);
if (user == null)
var lstUser = col4.Split(',');
foreach (var obj in lstUser)
{
result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + col4 + "]不在项目用户信息中！" + "|";
var user = projectUsers.FirstOrDefault(x => x.UserName == obj);
if (user == null)
{
result += "第" + (i + 2).ToString() + "行," + "五环责任人" + "," + "[" + obj + "]不在项目用户信息中！" + "|";
}
}
}
@ -408,7 +458,7 @@ namespace FineUIPro.Web.JDGL.Check
select new { x.UserId, y.UserName };
var cns = from x in db.Base_CNProfessional select x;
var unitWorks = from x in db.WBS_UnitWork where x.ProjectId == this.CurrUser.LoginProjectId select x;
string weekNo = this.txtWeekNo.Text.Trim();
string weekNo = this.drpWeekNo.SelectedValue.Trim();
DateTime startDate = Convert.ToDateTime(this.txtStartDate.Text.Trim());
DateTime endDate = Convert.ToDateTime(this.txtEndDate.Text.Trim());
if (pds != null && ir > 0)
@ -457,11 +507,17 @@ namespace FineUIPro.Web.JDGL.Check
}
if (!string.IsNullOrEmpty(col4))//五环责任人
{
var projectUser = projectUsers.FirstOrDefault(x => x.UserName == col4);
if (projectUser != null)
var lstUser = col4.Split(',');
var lstUserIds = string.Empty;
foreach (var obj in lstUser)
{
WeekPlan.DutyPerson = projectUser.UserId;
var projectUser = projectUsers.FirstOrDefault(x => x.UserName == obj);
if (projectUser != null)
{
lstUserIds = !string.IsNullOrWhiteSpace(lstUserIds) ? $"{lstUserIds},{projectUser.UserId}" : projectUser.UserId;
}
}
WeekPlan.DutyPerson = lstUserIds;
}
if (!string.IsNullOrEmpty(col5))//计划完成时间
{
@ -504,7 +560,7 @@ namespace FineUIPro.Web.JDGL.Check
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
if (string.IsNullOrEmpty(this.txtWeekNo.Text.Trim()))
if (string.IsNullOrEmpty(this.drpWeekNo.SelectedValue.Trim()))
{
ShowNotify("请选择周号！", MessageBoxIcon.Warning);
return;
@ -514,7 +570,7 @@ namespace FineUIPro.Web.JDGL.Check
var WeekPlanLists = from x in Funs.DB.JDGL_WeekPlan where x.ProjectId == this.ProjectId select x;
string quantityListId = string.Empty;
int a = WeekPlans.Count();
string weekNo = this.txtWeekNo.Text.Trim();
string weekNo = this.drpWeekNo.SelectedValue.Trim();
for (int i = 0; i < a; i++)
{
@ -525,7 +581,7 @@ namespace FineUIPro.Web.JDGL.Check
newWeekPlan.WeekPlanId = SQLHelper.GetNewID(typeof(Model.JDGL_WeekPlan));
newWeekPlan.ProjectId = this.ProjectId;
newWeekPlan.WeekNo = weekNo;
newWeekPlan.StartDate= WeekPlans[i].StartDate;
newWeekPlan.StartDate = WeekPlans[i].StartDate;
newWeekPlan.EndDate = WeekPlans[i].EndDate;
newWeekPlan.UnitWork = WeekPlans[i].UnitWork;
newWeekPlan.Major = WeekPlans[i].Major;
@ -666,7 +722,16 @@ namespace FineUIPro.Web.JDGL.Check
string name = string.Empty;
if (DutyPerson != null)
{
name = BLL.UserService.GetUserNameByUserId(DutyPerson.ToString());
var lstUser = DutyPerson.ToString().Split(',');
var lstUserIds = string.Empty;
foreach (var obj in lstUser)
{
var username = BLL.UserService.GetUserNameByUserId(obj);
if (username != null)
{
name = !string.IsNullOrWhiteSpace(name) ? $"{name},{username}" : username;
}
}
}
return name;
}

56
SGGL/FineUIPro.Web/JDGL/Check/WeekPlanIn.aspx.designer.cs generated
View File

@ -7,11 +7,13 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.JDGL.Check {
public partial class WeekPlanIn {
namespace FineUIPro.Web.JDGL.Check
{
public partial class WeekPlanIn
{
/// <summary>
/// form1 控件。
/// </summary>
@ -20,7 +22,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
/// <summary>
/// PageManager1 控件。
/// </summary>
@ -29,7 +31,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.PageManager PageManager1;
/// <summary>
/// SimpleForm1 控件。
/// </summary>
@ -38,7 +40,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// Toolbar2 控件。
/// </summary>
@ -47,16 +49,16 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// txtWeekNo 控件。
/// drpWeekNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtWeekNo;
protected global::FineUIPro.DropDownList drpWeekNo;
/// <summary>
/// txtStartDate 控件。
/// </summary>
@ -65,7 +67,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
@ -74,7 +76,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// btnAudit 控件。
/// </summary>
@ -83,7 +85,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnAudit;
/// <summary>
/// btnImport 控件。
/// </summary>
@ -92,7 +94,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnImport;
/// <summary>
/// btnSave 控件。
/// </summary>
@ -101,7 +103,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnSave;
/// <summary>
/// btnDownLoad 控件。
/// </summary>
@ -110,7 +112,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Button btnDownLoad;
/// <summary>
/// fuAttachUrl 控件。
/// </summary>
@ -119,7 +121,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.FileUpload fuAttachUrl;
/// <summary>
/// Grid1 控件。
/// </summary>
@ -128,7 +130,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// Label2 控件。
/// </summary>
@ -137,7 +139,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// Label3 控件。
/// </summary>
@ -146,7 +148,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label3;
/// <summary>
/// Label4 控件。
/// </summary>
@ -155,7 +157,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label4;
/// <summary>
/// lbImageUrl 控件。
/// </summary>
@ -164,7 +166,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label lbImageUrl;
/// <summary>
/// Label1 控件。
/// </summary>
@ -173,7 +175,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label5 控件。
/// </summary>
@ -182,7 +184,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label5;
/// <summary>
/// hdFileName 控件。
/// </summary>
@ -191,7 +193,7 @@ namespace FineUIPro.Web.JDGL.Check {
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.HiddenField hdFileName;
/// <summary>
/// hdCheckResult 控件。
/// </summary>

167
SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx.cs
View File

@ -11,26 +11,26 @@ using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ProjectData
{
public partial class ProjectSet : PageBase
{
public string URLToken
{
get
{
return (string)ViewState["URLToken"];
}
set
{
ViewState["URLToken"] = value;
}
}
{
public string URLToken
{
get
{
return (string)ViewState["URLToken"];
}
set
{
ViewState["URLToken"] = value;
}
}
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
#region 加载
/// <summary>
/// 加载页面
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
@ -229,68 +229,68 @@ namespace FineUIPro.Web.ProjectData
}
}
}
/// <summary>
/// 关联摄像头
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMonitor_Click(object sender, EventArgs e)
{
var sysSet16 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控地址" select x).ToList().FirstOrDefault();
var sysSet17 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控密码" select x).ToList().FirstOrDefault();
if (sysSet16 == null)
{
ShowNotify("视频监控地址未设置！", MessageBoxIcon.Warning);
return;
}
if (sysSet17 == null)
{
ShowNotify("视频监控密码未设置！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string url = sysSet16.SetValue;
string username = "admin";
string password = sysSet17.SetValue;
/// <summary>
/// 关联摄像头
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnMonitor_Click(object sender, EventArgs e)
{
var sysSet16 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控地址" select x).ToList().FirstOrDefault();
var sysSet17 = (from x in Funs.DB.Sys_Set where x.SetName == "视频监控密码" select x).ToList().FirstOrDefault();
if (sysSet16 == null)
{
ShowNotify("视频监控地址未设置！", MessageBoxIcon.Warning);
return;
}
if (sysSet17 == null)
{
ShowNotify("视频监控密码未设置！", MessageBoxIcon.Warning);
return;
}
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{
string url = sysSet16.SetValue;
string username = "admin";
string password = sysSet17.SetValue;
if (string.IsNullOrEmpty(URLToken))
{
String res = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/login?username=" + username + "&password=" + Funs.EncryptionPassword(password));
Dictionary<string, string> dicres = JsonConvert.DeserializeObject<Dictionary<string, string>>(res);
URLToken = dicres["URLToken"];
}
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == Grid1.SelectedRowID);
if (string.IsNullOrEmpty(URLToken))
{
String res = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/login?username=" + username + "&password=" + Funs.EncryptionPassword(password));
Dictionary<string, string> dicres = JsonConvert.DeserializeObject<Dictionary<string, string>>(res);
URLToken = dicres["URLToken"];
}
var project = Funs.DB.Base_Project.FirstOrDefault(x => x.ProjectId == Grid1.SelectedRowID);
string resUserInfor = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/info?token=" + URLToken + "&username=" + project.ProjectCode);
if ("user not found".Equals(resUserInfor) || "远程服务器返回错误: (400) 错误的请求。".Equals(resUserInfor))
{
string resUserSave = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/save?token=" + URLToken + "&ID=0&Username=" + project.ProjectCode + "&Role=操作员,观众&Enable=true");
Dictionary<string, string> dicUserSave = JsonConvert.DeserializeObject<Dictionary<string, string>>(resUserSave);
project.MonitorId = dicUserSave["ID"];
string newPassWord = Funs.EncryptionPassword(DateTime.Now.Ticks.ToString());
newPassWord = newPassWord.Substring(newPassWord.Length - 9, 8);
string resResPS = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/resetpassword?token=" + URLToken + "&id=" + dicUserSave["ID"] + "&password=" + newPassWord);
project.MonitorPW = newPassWord;
string resUserInfor = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/info?token=" + URLToken + "&username=" + project.ProjectCode);
if ("user not found".Equals(resUserInfor) || "远程服务器返回错误: (400) 错误的请求。".Equals(resUserInfor))
{
string resUserSave = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/save?token=" + URLToken + "&ID=0&Username=" + project.ProjectCode + "&Role=操作员,观众&Enable=true");
Dictionary<string, string> dicUserSave = JsonConvert.DeserializeObject<Dictionary<string, string>>(resUserSave);
project.MonitorId = dicUserSave["ID"];
string newPassWord = Funs.EncryptionPassword(DateTime.Now.Ticks.ToString());
newPassWord = newPassWord.Substring(newPassWord.Length - 9, 8);
string resResPS = BLL.CommonService.CreateGetHttpResponse(url + "api/v1/user/resetpassword?token=" + URLToken + "&id=" + dicUserSave["ID"] + "&password=" + newPassWord);
project.MonitorPW = newPassWord;
Funs.DB.SubmitChanges();
}
Funs.DB.SubmitChanges();
}
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectMonitorList.aspx?ProjectCode={0}&Id={1}&URLToken={2}", project.ProjectCode, project.MonitorId, URLToken, "查看 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectMonitorList.aspx?ProjectCode={0}&Id={1}&URLToken={2}", project.ProjectCode, project.MonitorId, URLToken, "查看 - ")));
}
else
{
ShowNotify("请选择项目进入！", MessageBoxIcon.Warning);
}
}
}
else
{
ShowNotify("请选择项目进入！", MessageBoxIcon.Warning);
}
}
/// <summary>
/// 查看
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnView_Click(object sender, EventArgs e)
/// <summary>
/// 查看
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnView_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(Grid1.SelectedRowID))
{ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("ProjectSetMap.aspx?projectId={0}&value=0", Grid1.SelectedRowID, "查看 - "))); }
@ -316,11 +316,11 @@ namespace FineUIPro.Web.ProjectData
var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, menuId);
if (buttonList.Count() > 0)
{
if (buttonList.Contains(BLL.Const.BtnAdd))
{
btnUpdata.Hidden = false;
this.btnNew.Hidden = false;
}
//if (buttonList.Contains(BLL.Const.BtnAdd))
//{
// btnUpdata.Hidden = false;
// this.btnNew.Hidden = false;
//}
if (buttonList.Contains(BLL.Const.BtnModify) || buttonList.Contains(BLL.Const.BtnSave))
{
this.btnMenuEdit.Hidden = false;
@ -330,6 +330,13 @@ namespace FineUIPro.Web.ProjectData
this.btnMenuDelete.Hidden = false;
}
}
string curruserId = this.CurrUser.UserId;
if (curruserId == Const.sysglyId || curruserId == Const.hfnbdId || curruserId == Const.fuweiId || curruserId == Const.shenyinhangId || curruserId == Const.zhanghuijuanId)
{//只有管理员、JT、付伟、申银行、张慧敏的账号可以新增和维护项目数据
btnUpdata.Hidden = false;
this.btnNew.Hidden = false;
}
}
#endregion

489
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx
View File

@ -14,237 +14,272 @@
<Rows>
<f:FormRow>
<Items>
<%-- <f:TextBox ID="txtProjectName" runat="server" Label="项目名称" Required="true" MaxLength="100"
ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" FocusOnPageLoad="true" ></f:TextBox>--%>
<%-- <f:DropDownList ID="drpProject" runat="server" Label="项目名称" EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>--%>
<f:DropDownBox runat="server" ID="drpProjectBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="项目名称" EmptyText="请从下拉表格中选择PMP系统项目" DataControlID="Grid2"
EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true">
<PopPanel>
<f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Form ID="Form2" ShowBorder="False" ShowHeader="False" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号、名称查找" ShowLabel="false" ID="ttbPmpProCodeSearch"
ShowTrigger1="false" OnTrigger1Click="ttbPmpProCodeSearch_Trigger1Click" OnTrigger2Click="ttbPmpProCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="Name"
DataIDField="Name" DataTextField="Name" EnableMultiSelect="false"
PageSize="50" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="StNum" SortDirection="DESC"
OnSort="Grid2_Sort">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="80px" DataField="StNum" HeaderText="项目编号" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Name" HeaderText="项目名称" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Address" HeaderText="地址" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectCode" runat="server" Label="项目号" Required="true" MaxLength="50"
ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
</Items>
<Items>
<f:TextBox ID="txtShortName" runat="server" Label="简称" LabelWidth="150px" MaxLength="20" Required="true" ShowRedStar="true"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpMasterBox1" Label="主数据项目" EmptyText="请从下拉表格中选择集团项目" DataControlID="Grid1"
EnableMultiSelect="false" MatchFieldWidth="false">
<PopPanel>
<f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Form ID="Form5" ShowBorder="False" ShowHeader="False" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号查找" ShowLabel="false" ID="ttbCodeSearch"
ShowTrigger1="false" OnTrigger1Click="ttbCodeSearch_Trigger1Click" OnTrigger2Click="ttbCodeSearch_Trigger2Click"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
<f:TwinTriggerBox Width="400px" runat="server" EmptyText="按项目名称查找" ShowLabel="false" ID="ttbNameSearch"
ShowTrigger1="false" OnTrigger1Click="ttbNameSearch_Trigger1Click" OnTrigger2Click="ttbNameSearch_Trigger2Click"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid1" BoxFlex="1" DataKeyNames="SysId"
DataIDField="SysId" DataTextField="PrjName" EnableMultiSelect="false"
PageSize="1000" ShowBorder="true" ShowHeader="false"
AllowPaging="false" IsDatabasePaging="false" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="PrjName" SortDirection="ASC"
OnSort="Grid1_Sort">
<Columns>
<f:RowNumberField TextAlign="Center" />
<f:BoundField Width="200px" DataField="PrjCode" HeaderText="项目编号" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="400px" DataField="PrjName" HeaderText="项目名称" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="50% 25% 25%">
<Items>
<f:DropDownList ID="drpProjectType" Label="项目类型" runat="server">
</f:DropDownList>
<f:DropDownList ID="drpProjectState" runat="server" Label="项目状态" LabelAlign="Right" LabelWidth="150px">
<f:ListItem Text="在建" Value="1" Selected="true" />
<f:ListItem Text="停工" Value="2" />
<f:ListItem Text="竣工" Value="3" />
</f:DropDownList>
<f:DropDownList runat="server" ID="drpProjectState2" Label="细分状态"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" Label="开工日期" ID="txtStartDate"
Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtStartDate_Blur">
</f:DatePicker>
<f:DatePicker runat="server" Label="竣工日期" ID="txtEndDate" LabelWidth="150px"
AutoPostBack="true" OnTextChanged="txtStartDate_Blur">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtContractNo" runat="server" Label="合同号"></f:TextBox>
<f:NumberBox runat="server" ID="txtDuration" Label="项目建设工期(月)" DecimalPrecision="1"
NoNegative="true" LabelWidth="150px">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理"
EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" LabelWidth="150px" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpQAManager" runat="server" Label="质量经理"
EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" LabelWidth="150px" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpDriveManager" runat="server" Label="开车经理" EnableEdit="true">
</f:DropDownList>
<f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" LabelWidth="150px" MaxLength="500"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号" MaxLength="50" LabelWidth="150px"></f:TextBox>
<f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtWorkRange" runat="server" Label="工作范围" MaxLength="500" Height="50px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtRemark" runat="server" Label="项目概况" MaxLength="500" Height="50px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtProjectMoney" Label="合同额(万元)" NoNegative="true"></f:NumberBox>
<f:NumberBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="150px"
NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTelephone" runat="server" Label="项目部电话" MaxLength="50">
</f:TextBox>
</Items>
<Items>
<f:DropDownList ID="drpCountry" runat="server" Label="国家" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpCountry_SelectedIndexChanged"
ShowRedStar="true" Required="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpProvince" runat="server" Label="省份" EnableEdit="true">
</f:DropDownList>
</Items>
<Items>
<f:TextBox ID="txtCity" runat="server" Label="城市" MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 10% 50%">
<Items>
<f:TextBox ID="txtMapCoordinates" runat="server" Label="坐标" MaxLength="50"></f:TextBox>
<f:ContentPanel ID="bottomPanel" RegionPosition="Bottom" ShowBorder="false" ShowHeader="false" EnableCollapse="false" runat="server">
<a href="http://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">拾取坐标</a>
<f:ContentPanel ID="ContentPanel1" Title="项目基本信息" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form_edit" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpProjectBox" AutoPostBack="true" OnTextChanged="TextBox_TextChanged" Label="项目名称" EmptyText="请从下拉表格中选择PMP系统项目" DataControlID="Grid2"
EnableMultiSelect="false" MatchFieldWidth="false" Required="true" ShowRedStar="true">
<PopPanel>
<f:Panel ID="Panel1" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Form ID="Form2" ShowBorder="False" ShowHeader="False" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号、名称查找" ShowLabel="false" ID="ttbPmpProCodeSearch"
ShowTrigger1="false" OnTrigger1Click="ttbPmpProCodeSearch_Trigger1Click" OnTrigger2Click="ttbPmpProCodeSearch_Trigger2Click" Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid2" BoxFlex="1" DataKeyNames="Name"
DataIDField="Name" DataTextField="Name" EnableMultiSelect="false"
PageSize="50" ShowBorder="true" ShowHeader="false"
AllowPaging="true" IsDatabasePaging="true" OnPageIndexChange="Grid2_PageIndexChange" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="StNum" SortDirection="DESC"
OnSort="Grid2_Sort">
<Columns>
<f:TemplateField ColumnID="tfPageIndex" Width="50px" HeaderText="序号" HeaderTextAlign="Center" TextAlign="Center"
EnableLock="true" Locked="true">
<ItemTemplate>
<asp:Label ID="lblPageIndex" runat="server" Text='<%# Grid2.PageIndex * Grid2.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:BoundField Width="80px" DataField="StNum" HeaderText="项目编号" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Name" HeaderText="项目名称" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="200px" DataField="Address" HeaderText="地址" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>
<Items>
<f:TextBox ID="txtProjectCode" runat="server" Label="项目号" Required="true" MaxLength="50" LabelWidth="150px"
ShowRedStar="true" AutoPostBack="true" OnTextChanged="TextBox_TextChanged">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownBox runat="server" ID="drpMasterBox1" Label="主数据项目" EmptyText="请从下拉表格中选择集团项目" DataControlID="Grid1"
EnableMultiSelect="false" MatchFieldWidth="false">
<PopPanel>
<f:Panel ID="Panel7" runat="server" BodyPadding="10px" Width="820px" Height="420px" Hidden="true"
ShowBorder="true" ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
<Items>
<f:Form ID="Form5" ShowBorder="False" ShowHeader="False" runat="server">
<Rows>
<f:FormRow>
<Items>
<f:TwinTriggerBox Width="200px" runat="server" EmptyText="按项目编号查找" ShowLabel="false" ID="ttbCodeSearch"
ShowTrigger1="false" OnTrigger1Click="ttbCodeSearch_Trigger1Click" OnTrigger2Click="ttbCodeSearch_Trigger2Click"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
<f:TwinTriggerBox Width="400px" runat="server" EmptyText="按项目名称查找" ShowLabel="false" ID="ttbNameSearch"
ShowTrigger1="false" OnTrigger1Click="ttbNameSearch_Trigger1Click" OnTrigger2Click="ttbNameSearch_Trigger2Click"
Trigger1Icon="Clear" Trigger2Icon="Search">
</f:TwinTriggerBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
<f:Grid ID="Grid1" BoxFlex="1" DataKeyNames="SysId"
DataIDField="SysId" DataTextField="PrjName" EnableMultiSelect="false"
PageSize="1000" ShowBorder="true" ShowHeader="false"
AllowPaging="false" IsDatabasePaging="false" runat="server" EnableCheckBoxSelect="true"
AllowSorting="false" SortField="PrjName" SortDirection="ASC"
OnSort="Grid1_Sort">
<Columns>
<f:RowNumberField TextAlign="Center" />
<f:BoundField Width="200px" DataField="PrjCode" HeaderText="项目编号" />
<f:BoundField ExpandUnusedSpace="true" MinWidth="400px" DataField="PrjName" HeaderText="项目名称" />
</Columns>
</f:Grid>
</Items>
</f:Panel>
</PopPanel>
</f:DropDownBox>
</Items>
<Items>
<f:TextBox ID="txtJTProjectCode" runat="server" Label="集团项目号" MaxLength="50" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="30% 40% 30%">
<Items>
<f:TextBox ID="txtShortName" runat="server" Label="简称" MaxLength="20" Required="true" ShowRedStar="true"></f:TextBox>
<f:TextBox ID="txtProjectNameEn" runat="server" Label="英文名称" MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" Width="300px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="30% 40% 30%">
<Items>
<f:DropDownList ID="drpProjectType" Label="项目类型" runat="server">
</f:DropDownList>
<f:DropDownList ID="drpProjectState" runat="server" Label="项目状态" LabelAlign="Right" >
<f:ListItem Text="在建" Value="1" Selected="true" />
<f:ListItem Text="停工" Value="2" />
<f:ListItem Text="竣工" Value="3" />
</f:DropDownList>
<f:DropDownList runat="server" ID="drpProjectState2" Label="细分状态"></f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" Label="开工日期" ID="txtStartDate"
Required="true" ShowRedStar="true" AutoPostBack="true" OnTextChanged="txtStartDate_Blur">
</f:DatePicker>
<f:DatePicker runat="server" Label="计划开始日期" LabelWidth="150px" ID="txtPlanStartDate">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DatePicker runat="server" Label="竣工日期" ID="txtEndDate" AutoPostBack="true" OnTextChanged="txtStartDate_Blur">
</f:DatePicker>
<f:DatePicker runat="server" Label="计划结束日期" LabelWidth="150px" ID="txtPlanEndDate">
</f:DatePicker>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtContractNo" runat="server" Label="合同号"></f:TextBox>
<f:NumberBox runat="server" ID="txtDuration" Label="项目建设工期(月)" DecimalPrecision="1"
NoNegative="true" LabelWidth="150px">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtStClientName" runat="server" Label="业主名称"></f:TextBox>
<f:TextBox ID="txtClientContactor" runat="server" Label="业主联系人" LabelWidth="150px"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtTelephone" runat="server" Label="项目部电话" MaxLength="50">
</f:TextBox>
<f:TextBox ID="txtMobileTel" runat="server" Label="业主联系人电话" MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextArea ID="txtWorkRange" runat="server" Label="工作范围" MaxLength="500" Height="120px"></f:TextArea>
<f:TextArea ID="txtRemark" runat="server" Label="项目概况" MaxLength="500" Height="120px" LabelWidth="150px"></f:TextArea>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtProjectMoney" Label="合同额(万元)" NoNegative="true"></f:NumberBox>
<f:NumberBox runat="server" ID="txtConstructionMoney" Label="施工合同额(万元)" LabelWidth="150px"
NoNegative="true">
</f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjectAddress" runat="server" Label="项目地址" MaxLength="500"></f:TextBox>
<f:DropDownList ID="drpUnit" Label="所属单位" runat="server" EnableEdit="true" LabelWidth="150px">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpCountry" runat="server" Label="国家" EnableEdit="true"
AutoPostBack="true" OnSelectedIndexChanged="drpCountry_SelectedIndexChanged"
ShowRedStar="true" Required="true">
</f:DropDownList>
</Items>
<Items>
<f:CheckBox runat="server" ID="ckbIsForeign" Label="海外项目" LabelWidth="150px"></f:CheckBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpProvince" runat="server" Label="省份" EnableEdit="true">
</f:DropDownList>
</Items>
<Items>
<f:TextBox ID="txtCity" runat="server" Label="城市" MaxLength="50" LabelWidth="150px">
</f:TextBox>
</Items>
</f:FormRow>
<f:FormRow ColumnWidths="40% 10% 50%">
<Items>
<f:TextBox ID="txtMapCoordinates" runat="server" Label="坐标" MaxLength="50"></f:TextBox>
<f:ContentPanel ID="bottomPanel" RegionPosition="Bottom" ShowBorder="false" ShowHeader="false" EnableCollapse="false" runat="server">
<a href="http://api.map.baidu.com/lbsapi/getpoint/index.html" target="_blank">拾取坐标</a>
</f:ContentPanel>
<f:NumberBox runat="server" ID="txtProgress" Label="项目进度(%)" NoNegative="true" LabelWidth="150px"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHJProjectCode" runat="server" Label="焊接软件项目编号" LabelWidth="150px" MaxLength="50"></f:TextBox>
<f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjType" runat="server" Label="控制软件项目类型" LabelWidth="150px" MaxLength="50"></f:TextBox>
<f:TextBox ID="txtProjPhase" runat="server" Label="控制软件项目阶段" LabelWidth="150px" MaxLength="50"></f:TextBox>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
<f:TextBox ID="txtEnglishRemark" runat="server" Label="英文简称" MaxLength="3" LabelWidth="150px" Width="300px"></f:TextBox>
</Items>
</f:FormRow>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtHJProjectCode" runat="server" Label="焊接软件项目编号" LabelWidth="150px" MaxLength="50"></f:TextBox>
<f:TextBox ID="txtKZProjectCode" runat="server" Label="控制软件项目编号" LabelWidth="150px" MaxLength="50"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:TextBox ID="txtProjType" runat="server" Label="控制软件项目类型" LabelWidth="150px" MaxLength="50"></f:TextBox>
<f:TextBox ID="txtProjPhase" runat="server" Label="控制软件项目阶段" LabelWidth="150px" MaxLength="50"></f:TextBox>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:NumberBox runat="server" ID="txtProgress" Label="项目进度(%)" NoNegative="true"></f:NumberBox>
<f:Label runat="server"></f:Label>
<f:ContentPanel ID="ContentPanel2" Title="项目OBS" ShowBorder="true"
BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true"
runat="server">
<f:Form ID="Form3" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow>
<Items>
<f:DropDownList ID="drpProjectManager" runat="server" Label="项目经理"
EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpConstructionManager" runat="server" Label="施工经理" LabelWidth="150px" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpQAManager" runat="server" Label="质量经理"
EnableEdit="true" Required="true" ShowRedStar="true">
</f:DropDownList>
<f:DropDownList ID="drpHSSEManager" runat="server" Label="安全经理" LabelWidth="150px" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="drpDriveManager" runat="server" Label="开车经理" EnableEdit="true">
</f:DropDownList>
</Items>
</f:FormRow>
</Rows>
</f:Form>
</f:ContentPanel>
</Items>
</f:FormRow>
</Rows>

91
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs
View File

@ -35,6 +35,16 @@ namespace FineUIPro.Web.ProjectData
{
if (!IsPostBack)
{
string curruserId = this.CurrUser.UserId;
if (curruserId == Const.sysglyId || curruserId == Const.hfnbdId || curruserId == Const.fuweiId || curruserId == Const.shenyinhangId || curruserId == Const.zhanghuijuanId)
{//只有管理员、JT、付伟、申银行、张慧娟的账号可以新增和维护项目数据
this.btnSave.Hidden = false;
}
else
{
this.btnSave.Hidden = true;
}
BindGrid();
BindGrid2();
this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
@ -76,6 +86,7 @@ namespace FineUIPro.Web.ProjectData
this.drpProjectBox.Value = project.ProjectName;
}
//this.txtProjectName.Text = project.ProjectName;
this.txtProjectNameEn.Text = project.ProjectNameEn;
this.txtProjectCode.Text = project.ProjectCode;
this.txtJTProjectCode.Text = project.JTProjectCode;
this.txtProjectAddress.Text = project.ProjectAddress;
@ -94,6 +105,14 @@ namespace FineUIPro.Web.ProjectData
{
this.txtEndDate.Text = string.Format("{0:yyyy-MM-dd}", project.EndDate);
}
if (project.PlanStartDate.HasValue)
{
this.txtPlanStartDate.Text = string.Format("{0:yyyy-MM-dd}", project.PlanStartDate);
}
if (project.PlanEndDate.HasValue)
{
this.txtPlanEndDate.Text = string.Format("{0:yyyy-MM-dd}", project.PlanEndDate);
}
this.txtShortName.Text = project.ShortName;
if (!string.IsNullOrEmpty(project.ProjectType))
@ -166,6 +185,9 @@ namespace FineUIPro.Web.ProjectData
this.txtProjectMoney.Text = project.ProjectMoney.ToString();
this.txtConstructionMoney.Text = project.ConstructionMoney.ToString();
this.txtTelephone.Text = project.Telephone;
this.txtStClientName.Text = project.StClientName;
this.txtClientContactor.Text = project.ClientContactor;
this.txtMobileTel.Text = project.MobileTel;
if (!string.IsNullOrEmpty(project.Country))
{
this.drpCountry.SelectedValue = project.Country;
@ -208,6 +230,7 @@ namespace FineUIPro.Web.ProjectData
{
ProjectCode = this.txtProjectCode.Text.Trim(),
JTProjectCode = this.txtJTProjectCode.Text.Trim(),
ProjectNameEn = this.txtProjectNameEn.Text.Trim(),
//ProjectName = Regex.Replace(this.txtProjectName.Text, @"\s", ""),
ProjectAddress = this.txtProjectAddress.Text.Trim(),
WorkRange = this.txtWorkRange.Text.Trim(),
@ -219,6 +242,9 @@ namespace FineUIPro.Web.ProjectData
ConstructionMoney = Funs.GetNewDecimal(this.txtConstructionMoney.Text),
Remark = this.txtRemark.Text.Trim(),
Telephone = this.txtTelephone.Text.Trim(),
StClientName = this.txtStClientName.Text.Trim(),
ClientContactor = this.txtClientContactor.Text.Trim(),
MobileTel = this.txtMobileTel.Text.Trim(),
HJProjectCode = this.txtHJProjectCode.Text.Trim(),
KZProjectCode = this.txtKZProjectCode.Text.Trim(),
City = this.txtCity.Text.Trim(),
@ -262,6 +288,16 @@ namespace FineUIPro.Web.ProjectData
project.EndDate = Funs.GetNewDateTime(this.txtEndDate.Text.Trim());
}
if (!string.IsNullOrEmpty(txtPlanStartDate.Text.Trim()))
{
project.PlanStartDate = Funs.GetNewDateTime(this.txtPlanStartDate.Text.Trim());
}
if (!string.IsNullOrEmpty(txtPlanEndDate.Text.Trim()))
{
project.PlanEndDate = Funs.GetNewDateTime(this.txtPlanEndDate.Text.Trim());
}
project.ShortName = this.txtShortName.Text.Trim();
if (this.drpProjectType.SelectedValue != BLL.Const._Null)
{
@ -429,16 +465,26 @@ namespace FineUIPro.Web.ProjectData
this.txtShortName.Text = pmpProject.ProjShortName;
this.txtProjectAddress.Text = pmpProject.Address;
this.txtCity.Text = pmpProject.CityName;
this.txtStartDate.Text = pmpProject.RealStartDate != null ? ((DateTime)pmpProject.RealStartDate).ToString("yyyy-MM-dd") : "";
this.txtEndDate.Text = pmpProject.RealEndDate != null ? ((DateTime)pmpProject.RealEndDate).ToString("yyyy-MM-dd") : "";
//this.txtEnglishRemark.Text = pmpProject.ProjectNameEn;
this.txtStartDate.Text = pmpProject.RealStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.RealStartDate) : "";
this.txtEndDate.Text = pmpProject.RealEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.RealEndDate) : "";
this.txtPlanStartDate.Text = pmpProject.PlanStartDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.PlanStartDate) : "";
this.txtPlanEndDate.Text = pmpProject.PlanEndDate.HasValue ? string.Format("{0:yyyy-MM-dd}", pmpProject.PlanEndDate) : "";
this.txtProjectNameEn.Text = pmpProject.ProjectNameEn;
this.txtStClientName.Text = pmpProject.StClientName;
this.txtClientContactor.Text = pmpProject.ClientContactor;
this.txtMobileTel.Text = pmpProject.MobileTel;
if (pmpProject.StLocationName == "境外")
{
this.ckbIsForeign.Checked = true;
}
}
}
#endregion
#region 设置项目、施工、安全经理
#region 设置项目OBS
/// <summary>
/// 设置项目、施工、安全经理
/// </summary>
@ -453,6 +499,8 @@ namespace FineUIPro.Web.ProjectData
var project = BLL.ProjectService.GetProjectByProjectId(projectId);
if (project != null)
{
#region 项目经理
string OldProjectManager = string.Empty; ////项目经理
var m = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.ProjectManager));
if (m != null)
@ -490,7 +538,11 @@ namespace FineUIPro.Web.ProjectData
BLL.ProjectUserService.AddProjectUser(newProjectUser);
}
}
////施工经理
#endregion
#region 施工经理
string OldConstructionManager = string.Empty;
var c = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.ConstructionManager));
if (c != null)
@ -528,7 +580,11 @@ namespace FineUIPro.Web.ProjectData
BLL.ProjectUserService.AddProjectUser(newProjectUser);
}
}
///安全经理
#endregion
#region 安全经理
string OldHSSEManager = string.Empty;
var h = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.HSSEManager));
if (h != null)
@ -567,7 +623,10 @@ namespace FineUIPro.Web.ProjectData
}
}
///质量经理
#endregion
#region 质量经理
string OldQAManager = string.Empty;
var qa = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.QAManager));
if (qa != null)
@ -606,7 +665,10 @@ namespace FineUIPro.Web.ProjectData
}
}
///开车经理
#endregion
#region 开车经理
string OldDriveManager = string.Empty;
var Drive = Funs.DB.Project_ProjectUser.FirstOrDefault(x => x.ProjectId == projectId && x.RoleId.Contains(BLL.Const.DriveManager));
if (Drive != null)
@ -644,6 +706,9 @@ namespace FineUIPro.Web.ProjectData
BLL.ProjectUserService.AddProjectUser(newProjectUser);
}
}
#endregion
}
}
#endregion
@ -1780,11 +1845,11 @@ namespace FineUIPro.Web.ProjectData
private void BindGrid2()
{
var lastPmpProject = (from x in Funs.DB.PMP_Project orderby x.CreateTime descending select x).FirstOrDefault();
if (lastPmpProject == null || DateTime.Now > lastPmpProject.CreateTime.AddHours(30))
{
PMPDataService.GetPMPProjectMasterData();
}
//var lastPmpProject = (from x in Funs.DB.PMP_Project orderby x.CreateTime descending select x).FirstOrDefault();
//if (lastPmpProject == null || DateTime.Now > lastPmpProject.CreateTime.AddHours(30))
//{
// PMPDataService.GetPMPProjectMasterData();
//}
//var pmptoken = PMPDataService.GetToken();
var list = (from x in Funs.DB.PMP_Project orderby x.StNum descending select x).ToList();
string codeName = ttbPmpProCodeSearch.Text.Trim();

468
SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.designer.cs generated
View File

@ -41,6 +41,24 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.Form SimpleForm1;
/// <summary>
/// ContentPanel1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel1;
/// <summary>
/// Form_edit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form_edit;
/// <summary>
/// drpProjectBox 控件。
/// </summary>
@ -104,15 +122,6 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.TextBox txtProjectCode;
/// <summary>
/// txtShortName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtShortName;
/// <summary>
/// drpMasterBox1 控件。
/// </summary>
@ -167,6 +176,42 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.Grid Grid1;
/// <summary>
/// txtJTProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJTProjectCode;
/// <summary>
/// txtShortName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtShortName;
/// <summary>
/// txtProjectNameEn 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectNameEn;
/// <summary>
/// txtEnglishRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEnglishRemark;
/// <summary>
/// drpProjectType 控件。
/// </summary>
@ -203,6 +248,15 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate;
/// <summary>
/// txtPlanStartDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanStartDate;
/// <summary>
/// txtEndDate 控件。
/// </summary>
@ -212,6 +266,15 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.DatePicker txtEndDate;
/// <summary>
/// txtPlanEndDate 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtPlanEndDate;
/// <summary>
/// txtContractNo 控件。
/// </summary>
@ -230,6 +293,213 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.NumberBox txtDuration;
/// <summary>
/// txtStClientName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtStClientName;
/// <summary>
/// txtClientContactor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtClientContactor;
/// <summary>
/// txtTelephone 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTelephone;
/// <summary>
/// txtMobileTel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMobileTel;
/// <summary>
/// txtWorkRange 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtWorkRange;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// txtProjectMoney 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtProjectMoney;
/// <summary>
/// txtConstructionMoney 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtConstructionMoney;
/// <summary>
/// txtProjectAddress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectAddress;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// drpCountry 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCountry;
/// <summary>
/// ckbIsForeign 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsForeign;
/// <summary>
/// drpProvince 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProvince;
/// <summary>
/// txtCity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCity;
/// <summary>
/// txtMapCoordinates 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMapCoordinates;
/// <summary>
/// bottomPanel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel bottomPanel;
/// <summary>
/// txtProgress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtProgress;
/// <summary>
/// txtHJProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHJProjectCode;
/// <summary>
/// txtKZProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtKZProjectCode;
/// <summary>
/// txtProjType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjType;
/// <summary>
/// txtProjPhase 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjPhase;
/// <summary>
/// ContentPanel2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel ContentPanel2;
/// <summary>
/// Form3 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Form Form3;
/// <summary>
/// drpProjectManager 控件。
/// </summary>
@ -275,186 +545,6 @@ namespace FineUIPro.Web.ProjectData
/// </remarks>
protected global::FineUIPro.DropDownList drpDriveManager;
/// <summary>
/// drpUnit 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpUnit;
/// <summary>
/// txtProjectAddress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjectAddress;
/// <summary>
/// txtJTProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJTProjectCode;
/// <summary>
/// ckbIsForeign 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox ckbIsForeign;
/// <summary>
/// txtWorkRange 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtWorkRange;
/// <summary>
/// txtRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextArea txtRemark;
/// <summary>
/// txtProjectMoney 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtProjectMoney;
/// <summary>
/// txtConstructionMoney 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtConstructionMoney;
/// <summary>
/// txtTelephone 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtTelephone;
/// <summary>
/// drpCountry 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpCountry;
/// <summary>
/// drpProvince 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpProvince;
/// <summary>
/// txtCity 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtCity;
/// <summary>
/// txtMapCoordinates 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtMapCoordinates;
/// <summary>
/// bottomPanel 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.ContentPanel bottomPanel;
/// <summary>
/// txtEnglishRemark 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtEnglishRemark;
/// <summary>
/// txtHJProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtHJProjectCode;
/// <summary>
/// txtKZProjectCode 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtKZProjectCode;
/// <summary>
/// txtProjType 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjType;
/// <summary>
/// txtProjPhase 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtProjPhase;
/// <summary>
/// txtProgress 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtProgress;
/// <summary>
/// Toolbar1 控件。
/// </summary>

10
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx
View File

@ -21,6 +21,7 @@
<Toolbars>
<f:Toolbar ID="ToolSearch" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:TextBox runat="server" ID="txtNo" Label="No" LabelWidth="40px" LabelAlign="Right" Width="120px"></f:TextBox>
<f:TextBox runat="server" ID="txtSystem_No" Label="System No" LabelWidth="100px" LabelAlign="Right" Width="180px"></f:TextBox>
<%--<f:TextBox runat="server" ID="txtSub_Sys_No" Label="Turnover System Code" LabelWidth="180px" LabelAlign="Right"></f:TextBox>--%>
<f:DropDownList ID="drpTurnoverSystemCode" runat="server" Label="Turnover System Code" AutoPostBack="true" AutoSelectFirstItem="false" EnableMultiSelect="true" EnableCheckBoxSelect="true" LabelWidth="180px">
@ -76,6 +77,12 @@
<%--<f:ListItem Value="FWD" Text="FWD"></f:ListItem>--%>
<f:ListItem Value="JWD" Text="JWD"></f:ListItem>
</f:DropDownList>
<f:DatePicker runat="server" Label="Date Raised" ID="txtStartDate_Raised" LabelAlign="Right" LabelWidth="100px"
Width="220px">
</f:DatePicker>
<f:DatePicker runat="server" Label="Required Date" ID="txtEndRequired_Date" LabelAlign="Right" LabelWidth="110px"
Width="220px">
</f:DatePicker>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:RadioButtonList ID="rbOutType" Label="导出" runat="server" LabelWidth="50px" Width="180px">
<f:RadioItem Text="无图" Value="0" Selected="true" />
@ -100,9 +107,6 @@
<%-- <f:TextBox runat="server" ID="txtPIC" Label="责任人PIC" LabelWidth="90px" LabelAlign="Right" Width="170px"></f:TextBox> --%>
<%-- <f:TextBox runat="server" ID="txtPIC_WUH" Label="责任人-五环/PIC-WUH" LabelWidth="160px" LabelAlign="Right" Width="240px"></f:TextBox> --%>
<f:DatePicker runat="server" Label="Required Date" ID="txtEndRequired_Date" LabelAlign="Right" LabelWidth="110px"
Width="220px">
</f:DatePicker>
</Items>
</f:Toolbar>
<%--<f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">

20
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.cs
View File

@ -46,11 +46,9 @@ namespace FineUIPro.Web.Transfer
public DataTable DataSql()
{
string strSql = @"select *
,(CASE isnull(IsEng,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsEngStr
,IsMatI IsMatIStr
from Transfer_PunchlistFrom
where ProjectId = @ProjectId";
string strSql = @"select * ,(CASE isnull(IsEng,0) WHEN 1 THEN 'Y' ELSE 'N' END) IsEngStr ,IsMatI IsMatIStr
from Transfer_PunchlistFrom
where ProjectId = @ProjectId";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
@ -59,6 +57,11 @@ namespace FineUIPro.Web.Transfer
strSql += " AND Raised_By = @Raised_By";
listStr.Add(new SqlParameter("@Raised_By", this.txtRaised_By.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtNo.Text.Trim()))
{
strSql += " AND Num_NO = @No";
listStr.Add(new SqlParameter("@No", this.txtNo.Text.Trim()));
}
if (!string.IsNullOrEmpty(this.txtSystem_No.Text.Trim()))
{
strSql += " AND System_No like @System_No";
@ -84,6 +87,11 @@ namespace FineUIPro.Web.Transfer
}
strSql += ")";
}
if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
{
strSql += " AND Date_Raised = @StartDate_Raised";
listStr.Add(new SqlParameter("@StartDate_Raised", Funs.GetNewDateTime(txtStartDate_Raised.Text.Trim())));
}
//if (!string.IsNullOrEmpty(txtStartDate_Raised.Text.Trim()))
//{
// strSql += " AND Date_Raised >= @StartDate_Raised";
@ -534,7 +542,7 @@ namespace FineUIPro.Web.Transfer
}
try
{
newUrl = uploadfilepath.Replace("导出模板", "导出数据").Replace(".xlsx", DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx");
newUrl = uploadfilepath.Replace("DataOut", "PunchlistFrom").Replace("导出模板", "导出数据").Replace(".xlsx", DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx");
File.Copy(uploadfilepath, newUrl);
NPOI.SS.UserModel.IWorkbook workbook;
using (FileStream stream = new FileStream(newUrl, FileMode.Open, FileAccess.Read))

36
SGGL/FineUIPro.Web/Transfer/PunchlistFrom.aspx.designer.cs generated
View File

@ -59,6 +59,15 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.Toolbar ToolSearch;
/// <summary>
/// txtNo 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtNo;
/// <summary>
/// txtSystem_No 控件。
/// </summary>
@ -176,6 +185,24 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.DropDownList ddlPunchType;
/// <summary>
/// txtStartDate_Raised 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtStartDate_Raised;
/// <summary>
/// txtEndRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndRequired_Date;
/// <summary>
/// rbOutType 控件。
/// </summary>
@ -239,15 +266,6 @@ namespace FineUIPro.Web.Transfer
/// </remarks>
protected global::FineUIPro.DropDownList ddlPIC_WUH;
/// <summary>
/// txtEndRequired_Date 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker txtEndRequired_Date;
/// <summary>
/// lbPhotoesImageUrl 控件。
/// </summary>

6
SGGL/FineUIPro.Web/common/mainProject2.aspx
View File

@ -682,11 +682,11 @@
</div>
<input type="hidden" id="hiddenUrl" value="" runat="server" />
<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnshowWindows" ToolTip="打开代办" Hidden="true"
<f:Button runat="server" CssClass="bgbtntop" IconFont="Gear" OnClick="btnshowWindows" ToolTip="打开待办" Hidden="true"
EnablePostBack="true" EnableDefaultState="true" EnableDefaultCorner="false" ID="btnShowWindows">
</f:Button>
<f:Window ID="Window1" Title="代办" Hidden="true" EnableIFrame="true" EnableMaximize="true"
<f:Window ID="Window1" Title="待办" Hidden="true" EnableIFrame="true" EnableMaximize="true"
Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
Width="1300px" Height="660px">
</f:Window>
@ -787,7 +787,7 @@
function reloadGrid(param) {
__doPostBack(null, 'ReloadGrid$' + param);
}
//弹框代办
//弹框待办
function returnWindows(objUrl) {
document.getElementById("hiddenUrl").value = objUrl;
$('#btnShowWindows').click();

4
SGGL/FineUIPro.Web/common/mainProject2.aspx.cs
View File

@ -1705,8 +1705,8 @@ where qc.QuantityCompletionId=(select top 1 QuantityCompletionId from[JDGL_Quant
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><li><span>" +
item.DataTime.ToString().Replace('/', '-').Split(' ')[0] + "</li></span></div>";
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>";
}
}
else

2
SGGL/FineUIPro.Web/common/main_new0.aspx
View File

@ -90,7 +90,7 @@
</div>
<div class="y_rs_box y_column">
<div class="y_rs_number" id="div_xmcjrs" runat="server">0</div>
<div class="y_rs_text"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_ProjectNum_Participants%>"/></div>
<div class="y_rs_text"><asp:Literal runat="server" Text="<%$ Resources:Lan,main_new0_ProjectNum_OnDuty%>"/></div>
</div>
</div>
</div>

205
SGGL/FineUIPro.Web/common/main_new0.aspx.cs
View File

@ -48,13 +48,13 @@ namespace FineUIPro.Web.common
div_qyzbzjrs.InnerHtml = (from x in db.Person_CompanyBranchPerson
where x.IsOnJob == true && x.WorkPostId == Const.WorkPost_HSSEDirector && x.UnitId == unitId
select x).Count().ToString();
//企业总部专职人数
div_qyzbzzrs.InnerHtml = (from x in db.Person_CompanyBranchPerson
join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.IsOnJob == true && y.IsHsse == true && x.UnitId == unitId
select x).Count().ToString();
//分支机构总监人数
div_fzjgzjrs.InnerHtml = (from x in db.Person_CompanyBranchPerson
where x.IsOnJob == true && x.WorkPostId == Const.WorkPost_HSSEDirector && x.UnitId != unitId
@ -64,7 +64,7 @@ namespace FineUIPro.Web.common
join y in db.Base_WorkPost on x.WorkPostId equals y.WorkPostId
where x.IsOnJob == true && y.IsHsse == true && x.UnitId != unitId
select x).Count().ToString();
if (pids == null)
{
//项目总监
@ -78,13 +78,15 @@ namespace FineUIPro.Web.common
where y.IsHsse == true && x.IsUsed == true
select x).Count().ToString();
div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
//项目参建
//企业总部参建人数
div_qyzbcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true
select x).Count().ToString();
//项目在岗人数
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true
where x.IsUsed == true && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now)
select x).Count().ToString();
//企业总部参建人数
div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
//注安师
var ZasSql = @"SELECT Person.ProjectId,Project.ProjectCode,Project.ProjectName,Unit.UnitId,Unit.UnitId,Unit.UnitName,
Person.PersonName,Person.PersonId,Person.IdentityCard,Person.Sex,Person.WorkPostId,WorkPost.WorkPostName,Person.Telephone
@ -102,7 +104,8 @@ namespace FineUIPro.Web.common
div_zasrs.InnerHtml = tb.Rows.Count.ToString();
}
else {
else
{
//项目总监
div_xmrs.InnerHtml = (from x in db.SitePerson_Person
where x.WorkPostId == Const.WorkPost_HSSEDirector && x.IsUsed == true
@ -114,10 +117,15 @@ namespace FineUIPro.Web.common
where y.IsHsse == true && x.IsUsed == true
&& pids.Contains(x.ProjectId)
select x).Count().ToString();
//项目参建
//项目参建人数
div_qyzbcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true
&& pids.Contains(x.ProjectId)
select x).Count().ToString();
//项目在岗人数
div_xmcjrs.InnerHtml = (from x in db.SitePerson_Person
where x.IsUsed == true
&& pids.Contains(x.ProjectId)
where x.IsUsed == true && pids.Contains(x.ProjectId) && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime.Value > DateTime.Now)
select x).Count().ToString();
string s1 = string.Format("'{0}'", String.Join(",", pids).Replace(",", "','"));
@ -141,11 +149,10 @@ namespace FineUIPro.Web.common
div_qyzbrs1.InnerHtml = div_xmrs.InnerHtml;
div_qyzbzzrs1.InnerHtml = div_xmzzrs.InnerHtml;
div_qyzbcjrs.InnerHtml = div_xmcjrs.InnerHtml;
}
//项目信息
getProjectInfo();
@ -184,8 +191,9 @@ namespace FineUIPro.Web.common
//int wHours = Funs.DB.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
this.div_safeworktime.InnerHtml = Count3().ToString().Split('.')[0];
}
else {
var list = db.Base_Project.Where(x=>pids.Contains(x.ProjectId));
else
{
var list = db.Base_Project.Where(x => pids.Contains(x.ProjectId));
//在建项目
div_zjxm.InnerHtml = list.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).Count().ToString();
//停工项目
@ -196,7 +204,7 @@ namespace FineUIPro.Web.common
//int wHours = Funs.DB.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
this.div_safeworktime.InnerHtml = Count3().ToString().Split('.')[0];
}
}
#endregion
#region 安全人工时穿透数据
@ -242,7 +250,8 @@ namespace FineUIPro.Web.common
cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0);
}
}
else {
else
{
var getAllPersonInOutList = from x in db.SitePerson_PersonInOutNumber
where pids.Contains(x.ProjectId)
select x;
@ -256,7 +265,7 @@ namespace FineUIPro.Web.common
var getD1 = from x in db.Accident_AccidentHandle
join y in db.Base_Project on x.ProjectId equals y.ProjectId
where pids.Contains(x.ProjectId)
where pids.Contains(x.ProjectId)
select x;
var getD2 = from x in db.Accident_AccidentReport
join y in db.Base_Project on x.ProjectId equals y.ProjectId
@ -275,7 +284,7 @@ namespace FineUIPro.Web.common
cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0);
}
}
return cout1;
}
@ -300,7 +309,8 @@ namespace FineUIPro.Web.common
{
list = db.Base_Project.Where(x => pids.Contains(x.ProjectId)).ToList();
}
else {
else
{
list = db.Base_Project.Where(x => (x.ProjectState == Const.ProjectState_1 || x.ProjectState == null)).ToList();
}
var hazardRegisters = from x in db.HSSE_Hazard_HazardRegister select x;
@ -366,17 +376,20 @@ namespace FineUIPro.Web.common
div_xmalh.InnerHtml = ((from x in Funs.DB.Meeting_WeekMeeting where x.WeekMeetingDate.Value.Year == date.Year && x.WeekMeetingDate.Value.Month == date.Month && x.WeekMeetingDate.Value.Day == date.Day select x).Count()
+ (from x in Funs.DB.Meeting_MonthMeeting where x.MonthMeetingDate.Value.Year == date.Year && x.MonthMeetingDate.Value.Month == date.Month && x.MonthMeetingDate.Value.Day == date.Day select x).Count()).ToString();
}
else {
else
{
//项目安全领导小组
div_xmaqldxz.InnerHtml = Funs.DB.Meeting_SafetyLeaderGroupMeeting.Where(x => x.CompileDate > Const.DtmarkTime
&& pids.Contains(x.ProjectId) ).Count().ToString();
&& pids.Contains(x.ProjectId)).Count().ToString();
//项目安全例会
DateTime date = DateTime.Now;
div_xmalh.InnerHtml = ((from x in Funs.DB.Meeting_WeekMeeting where x.WeekMeetingDate.Value.Year == date.Year && x.WeekMeetingDate.Value.Month == date.Month && x.WeekMeetingDate.Value.Day == date.Day
div_xmalh.InnerHtml = ((from x in Funs.DB.Meeting_WeekMeeting
where x.WeekMeetingDate.Value.Year == date.Year && x.WeekMeetingDate.Value.Month == date.Month && x.WeekMeetingDate.Value.Day == date.Day
&& pids.Contains(x.ProjectId)
select x).Count()
+ (from x in Funs.DB.Meeting_MonthMeeting where x.MonthMeetingDate.Value.Year == date.Year && x.MonthMeetingDate.Value.Month == date.Month && x.MonthMeetingDate.Value.Day == date.Day
+ (from x in Funs.DB.Meeting_MonthMeeting
where x.MonthMeetingDate.Value.Year == date.Year && x.MonthMeetingDate.Value.Month == date.Month && x.MonthMeetingDate.Value.Day == date.Day
&& pids.Contains(x.ProjectId)
select x).Count()).ToString();
@ -389,9 +402,9 @@ namespace FineUIPro.Web.common
/// 获取费用使用（万元）
/// </summary>
/// <returns></returns>
public int GetCostUse()
public int GetCostUse()
{
if (pids==null)
if (pids == null)
{
var result = 0;
var costs = (from x in Funs.DB.CostGoods_CostSmallDetailItem
@ -419,7 +432,7 @@ namespace FineUIPro.Web.common
/// 获取施工机具在用数
/// </summary>
/// <returns></returns>
public int GetUseEquipmentNum()
public int GetUseEquipmentNum()
{
if (pids == null)
{
@ -453,7 +466,7 @@ namespace FineUIPro.Web.common
/// 获取施工机具特种设备数
/// </summary>
/// <returns></returns>
public int GetSpecialEquipmentNum()
public int GetSpecialEquipmentNum()
{
if (pids == null)
{
@ -477,7 +490,7 @@ namespace FineUIPro.Web.common
/// 获取作业许可项数
/// </summary>
/// <returns></returns>
public int GetLicensesNum()
public int GetLicensesNum()
{
if (pids == null)
{
@ -500,7 +513,7 @@ namespace FineUIPro.Web.common
/// 获取作业许可关闭项数
/// </summary>
/// <returns></returns>
public int GetLicensesCloseNum()
public int GetLicensesCloseNum()
{
if (pids == null)
{
@ -525,9 +538,9 @@ namespace FineUIPro.Web.common
/// 获取一般隐患整改闭环项
/// </summary>
/// <returns></returns>
public int GetGeneralClosedNum()
public int GetGeneralClosedNum()
{
if (pids==null)
if (pids == null)
{
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.Risk_Level == "一般" && x.States == "3" &&
@ -538,19 +551,19 @@ namespace FineUIPro.Web.common
else
{
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.Risk_Level == "一般" && x.States == "3" &&
where x.Risk_Level == "一般" && x.States == "3" &&
x.CheckTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
select x).Count();
return result;
}
}
/// <summary>
/// 获取一般隐患未整改完成项
/// </summary>
/// <returns></returns>
public int GetGeneralNotClosedNum()
public int GetGeneralNotClosedNum()
{
if (pids == null)
{
@ -574,7 +587,7 @@ namespace FineUIPro.Web.common
/// 一般整改率
/// </summary>
/// <returns></returns>
public string GetGeneralZgl()
public string GetGeneralZgl()
{
var num1 = Math.Round(100.0 * GetGeneralClosedNum() / (GetGeneralClosedNum() + GetGeneralNotClosedNum()), 0).ToString();
return num1;
@ -584,7 +597,7 @@ namespace FineUIPro.Web.common
/// 获取重大隐患整改闭环项
/// </summary>
/// <returns></returns>
public int GetMajorClosedNum()
public int GetMajorClosedNum()
{
if (pids == null)
{
@ -608,7 +621,7 @@ namespace FineUIPro.Web.common
/// 获取重大隐患未整改完成项
/// </summary>
/// <returns></returns>
public int GetMajorNotClosedNum()
public int GetMajorNotClosedNum()
{
if (pids == null)
{
@ -632,7 +645,7 @@ namespace FineUIPro.Web.common
/// 重大整改率
/// </summary>
/// <returns></returns>
public string GetMajorZgl()
public string GetMajorZgl()
{
var num1 = Math.Round(100.0 * GetMajorClosedNum() / (GetMajorClosedNum() + GetMajorNotClosedNum()), 0).ToString();
if (num1 == "NaN") num1 = "0";
@ -646,16 +659,17 @@ namespace FineUIPro.Web.common
/// 获取企业负责人带班检查次数
/// </summary>
/// <returns></returns>
public int GetCompanyLeadShiftCheckNum()
public int GetCompanyLeadShiftCheckNum()
{
if (pids == null)
{
return HSSEData_HSSEService.GetCompanyLeadShiftCheckNum();
}
else {
else
{
return HSSEData_HSSEService.GetCompanyLeadShiftCheckNum(pids);
}
}
@ -664,7 +678,7 @@ namespace FineUIPro.Web.common
/// 获取企业综合检查次数
/// </summary>
/// <returns></returns>
public int GetCompanyComprehensiveCheckNum()
public int GetCompanyComprehensiveCheckNum()
{
if (pids == null)
return HSSEData_HSSEService.GetCompanyComprehensiveCheckNum();
@ -676,7 +690,7 @@ namespace FineUIPro.Web.common
/// 获取企业专项检查次数
/// </summary>
/// <returns></returns>
public int GetCompanySpecialCheckNum()
public int GetCompanySpecialCheckNum()
{
if (pids == null)
return HSSEData_HSSEService.GetCompanySpecialCheckNum();
@ -688,7 +702,7 @@ namespace FineUIPro.Web.common
/// 获取项目负责人带班检查次数
/// </summary>
/// <returns></returns>
public int GetProjectLeadShiftCheckNum()
public int GetProjectLeadShiftCheckNum()
{
if (pids == null)
{
@ -697,21 +711,22 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
var result = (from x in Funs.DB.Check_ProjectLeaderCheck
where x.CompileDate > Const.DtmarkTime
&& pids.Contains(x.ProjectId)
select x).Count();
return result;
}
}
/// <summary>
/// 获取项目专项检查次数
/// </summary>
/// <returns></returns>
public int GetProjectSpecialCheckNum()
public int GetProjectSpecialCheckNum()
{
if (pids == null)
{
@ -720,21 +735,22 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
var result = (from x in Funs.DB.Check_CheckSpecial
where x.CheckTime > Const.DtmarkTime
&& pids.Contains(x.ProjectId)
select x).Count();
return result;
}
}
/// <summary>
/// 获取项目专业检查次数
/// </summary>
/// <returns></returns>
public int GetProjectMajorCheckNum()
public int GetProjectMajorCheckNum()
{
if (pids == null)
{
@ -743,7 +759,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
where x.CheckTime > Const.DtmarkTime
&& pids.Contains(x.ProjectId)
@ -758,7 +775,7 @@ namespace FineUIPro.Web.common
/// 获取未遂事件数
/// </summary>
/// <returns></returns>
public int GetNearMissNum()
public int GetNearMissNum()
{
if (pids == null)
{
@ -768,21 +785,22 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
var result = (from x in Funs.DB.Accident_AccidentPersonRecord
join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
where x.IsAttempt == "1" && x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
select x).Count();
return result;
}
}
/// <summary>
/// 获取可记录事件数
/// </summary>
/// <returns></returns>
public int GetRecordableEventNum()
public int GetRecordableEventNum()
{
if (pids == null)
{
@ -792,21 +810,22 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
var result = (from x in Funs.DB.Accident_AccidentPersonRecord
join y in Funs.DB.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
where x.CompileDate > Const.DtmarkTime && pids.Contains(x.ProjectId)
select x).Count();
return result;
}
}
/// <summary>
/// 获取一般事故数
/// </summary>
/// <returns></returns>
public int GetGeneralAccidentNum()
public int GetGeneralAccidentNum()
{
if (pids == null)
{
@ -828,7 +847,7 @@ namespace FineUIPro.Web.common
/// 获取较大事故数
/// </summary>
/// <returns></returns>
public int GetMajorAccidentNum()
public int GetMajorAccidentNum()
{
if (pids == null)
{
@ -850,7 +869,7 @@ namespace FineUIPro.Web.common
/// 获取重大事故数
/// </summary>
/// <returns></returns>
public int GetSeriousAccidentNum()
public int GetSeriousAccidentNum()
{
if (pids == null)
{
@ -872,13 +891,14 @@ namespace FineUIPro.Web.common
/// 获取特别重大事故数
/// </summary>
/// <returns></returns>
public int GetSpecialSeriousAccidentNum()
public int GetSpecialSeriousAccidentNum()
{
if (pids == null) {
if (pids == null)
{
var result = (from x in Funs.DB.Accident_AccidentReport
where x.AccidentDegree == "4"
select x).Count();
return result;
where x.AccidentDegree == "4"
select x).Count();
return result;
}
else
{
@ -895,7 +915,7 @@ namespace FineUIPro.Web.common
/// 获取企业级综合预案数
/// </summary>
/// <returns></returns>
public int GetCompanyComprehensivePlanNum()
public int GetCompanyComprehensivePlanNum()
{
if (pids == null)
{
@ -928,7 +948,7 @@ namespace FineUIPro.Web.common
/// 获取企业级专项预案数
/// </summary>
/// <returns></returns>
public int GetCompanySpecialPlanNum()
public int GetCompanySpecialPlanNum()
{
if (pids == null)
{
@ -960,7 +980,7 @@ namespace FineUIPro.Web.common
/// 获取企业级现场处置预案
/// </summary>
/// <returns></returns>
public int GetCompanyOnSiteDisposalPlan()
public int GetCompanyOnSiteDisposalPlan()
{
if (pids == null)
{
@ -992,7 +1012,7 @@ namespace FineUIPro.Web.common
/// 获取企业级演练次数
/// </summary>
/// <returns></returns>
public int GetCompanyDrillNum()
public int GetCompanyDrillNum()
{
if (pids == null)
{
@ -1022,7 +1042,7 @@ namespace FineUIPro.Web.common
/// 获取三级安全教育培训数
/// </summary>
/// <returns></returns>
public int GetSafeTrainNum()
public int GetSafeTrainNum()
{
if (pids == null)
{
@ -1049,7 +1069,7 @@ namespace FineUIPro.Web.common
/// 获取专项培训数
/// </summary>
/// <returns></returns>
public int GetSpecialTrainNum()
public int GetSpecialTrainNum()
{
if (pids == null)
{
@ -1075,7 +1095,7 @@ namespace FineUIPro.Web.common
/// 获取特种作业培训数
/// </summary>
/// <returns></returns>
public int GetSpecialOperationTrainNum()
public int GetSpecialOperationTrainNum()
{
if (pids == null)
{
@ -1103,7 +1123,7 @@ namespace FineUIPro.Web.common
/// 获取一般风险数
/// </summary>
/// <returns></returns>
public int GetGeneralRiskNum()
public int GetGeneralRiskNum()
{
if (pids == null)
{
@ -1128,7 +1148,7 @@ namespace FineUIPro.Web.common
/// 获取低风险数
/// </summary>
/// <returns></returns>
public int GetLowRiskNum()
public int GetLowRiskNum()
{
if (pids == null)
{
@ -1153,7 +1173,7 @@ namespace FineUIPro.Web.common
/// 获取中风险数
/// </summary>
/// <returns></returns>
public int GetMediumRiskNum()
public int GetMediumRiskNum()
{
if (pids == null)
{
@ -1178,7 +1198,7 @@ namespace FineUIPro.Web.common
/// 获取高风险数
/// </summary>
/// <returns></returns>
public int GetHighRiskNum()
public int GetHighRiskNum()
{
if (pids == null)
{
@ -1188,7 +1208,8 @@ namespace FineUIPro.Web.common
select x).Count();
return result;
}
else {
else
{
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
where y.RiskLevel == 4 && (x.IsStart == true || x.State == "1")
@ -1204,7 +1225,7 @@ namespace FineUIPro.Web.common
/// 获取危大工程审批完成数
/// </summary>
/// <returns></returns>
public int GetCompletedNum()
public int GetCompletedNum()
{
if (pids == null)
{
@ -1228,19 +1249,19 @@ namespace FineUIPro.Web.common
/// 获取危大工程培训人次数
/// </summary>
/// <returns></returns>
public int GetTrainPersonNum()
public int GetTrainPersonNum()
{
if (pids == null)
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime
where x.IsSuperLargerHazard == false && x.TrainPersonNum != null && x.RecordTime > Const.DtmarkTime
select x.TrainPersonNum).ToList().Sum(x => x.Value);
return result;
}
else
{
var result = (from x in Funs.DB.Solution_LargerHazard
where x.IsSuperLargerHazard == false && x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
where x.IsSuperLargerHazard == false && x.TrainPersonNum != null && x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
select x.TrainPersonNum).ToList().Sum(x => x.Value);
return result;
}
@ -1250,7 +1271,7 @@ namespace FineUIPro.Web.common
/// 获取危大工程施工个数
/// </summary>
/// <returns></returns>
public int GetConstructionNum()
public int GetConstructionNum()
{
if (pids == null)
{
@ -1274,7 +1295,7 @@ namespace FineUIPro.Web.common
/// 获取危大工程完工个数
/// </summary>
/// <returns></returns>
public int GetFinishedNum()
public int GetFinishedNum()
{
if (pids == null)
{
@ -1298,7 +1319,7 @@ namespace FineUIPro.Web.common
/// 获取超危大工程审批完成数
/// </summary>
/// <returns></returns>
public int GetSuperCompletedNum()
public int GetSuperCompletedNum()
{
if (pids == null)
{
@ -1322,13 +1343,13 @@ namespace FineUIPro.Web.common
/// 获取超危大工程培训人次数
/// </summary>
/// <returns></returns>
public int GetSuperTrainPersonNum()
public int GetSuperTrainPersonNum()
{
if (pids == null)
{
var result =
(from x in Funs.DB.Solution_LargerHazard
where x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime
where x.IsSuperLargerHazard == true && x.TrainPersonNum != null && x.RecordTime > Const.DtmarkTime
select x.TrainPersonNum).ToList().Sum(x => x.Value);
return result;
}
@ -1336,7 +1357,7 @@ namespace FineUIPro.Web.common
{
var result =
(from x in Funs.DB.Solution_LargerHazard
where x.IsSuperLargerHazard == true && x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
where x.IsSuperLargerHazard == true && x.TrainPersonNum != null && x.RecordTime > Const.DtmarkTime && pids.Contains(x.ProjectId)
select x.TrainPersonNum).ToList().Sum(x => x.Value);
return result;
}
@ -1346,7 +1367,7 @@ namespace FineUIPro.Web.common
/// 获取超危大工程施工个数
/// </summary>
/// <returns></returns>
public int GetSuperConstructionNum()
public int GetSuperConstructionNum()
{
if (pids == null)
{
@ -1370,7 +1391,7 @@ namespace FineUIPro.Web.common
/// 获取超危大工程完工个数
/// </summary>
/// <returns></returns>
public int GetSuperFinishedNum()
public int GetSuperFinishedNum()
{
if (pids == null)
{

6
SGGL/FineUIPro.Web/index.aspx.cs
View File

@ -327,7 +327,8 @@ namespace FineUIPro.Web
this.hdHomePage.Text = "1";
if (this.CurrUser.HomePageType == "2")
{
this.Tab1.IFrameUrl = "~/common/main2.aspx";
//this.Tab1.IFrameUrl = "~/common/main2.aspx";
this.Tab1.IFrameUrl = "~/common/main_new.aspx";
this.hdHomePage.Text = "2";
}
if (Request.Cookies["SelectLan"] != null)
@ -545,7 +546,8 @@ namespace FineUIPro.Web
if (this.hdHomePage.Text == "1")
{
this.hdHomePage.Text = "2";
this.Tab1.IFrameUrl = "~/common/main2.aspx";
//this.Tab1.IFrameUrl = "~/common/main2.aspx";
this.Tab1.IFrameUrl = "~/common/main_new.aspx";
}
else
{

306
SGGL/Model/Model.cs
View File

@ -26719,6 +26719,18 @@ namespace Model
private System.Nullable<bool> _IsDelete;
private string _ProjectNameEn;
private string _StClientName;
private string _ClientContactor;
private string _MobileTel;
private System.Nullable<System.DateTime> _PlanStartDate;
private System.Nullable<System.DateTime> _PlanEndDate;
private EntitySet<Accident_AccidentHandle> _Accident_AccidentHandle;
private EntitySet<Accident_AccidentPersonRecord> _Accident_AccidentPersonRecord;
@ -27425,6 +27437,18 @@ namespace Model
partial void OnMasterSysIdChanged();
partial void OnIsDeleteChanging(System.Nullable<bool> value);
partial void OnIsDeleteChanged();
partial void OnProjectNameEnChanging(string value);
partial void OnProjectNameEnChanged();
partial void OnStClientNameChanging(string value);
partial void OnStClientNameChanged();
partial void OnClientContactorChanging(string value);
partial void OnClientContactorChanged();
partial void OnMobileTelChanging(string value);
partial void OnMobileTelChanged();
partial void OnPlanStartDateChanging(System.Nullable<System.DateTime> value);
partial void OnPlanStartDateChanged();
partial void OnPlanEndDateChanging(System.Nullable<System.DateTime> value);
partial void OnPlanEndDateChanged();
#endregion
public Base_Project()
@ -28589,6 +28613,126 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectNameEn", DbType="NVarChar(500)")]
public string ProjectNameEn
{
get
{
return this._ProjectNameEn;
}
set
{
if ((this._ProjectNameEn != value))
{
this.OnProjectNameEnChanging(value);
this.SendPropertyChanging();
this._ProjectNameEn = value;
this.SendPropertyChanged("ProjectNameEn");
this.OnProjectNameEnChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StClientName", DbType="NVarChar(200)")]
public string StClientName
{
get
{
return this._StClientName;
}
set
{
if ((this._StClientName != value))
{
this.OnStClientNameChanging(value);
this.SendPropertyChanging();
this._StClientName = value;
this.SendPropertyChanged("StClientName");
this.OnStClientNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ClientContactor", DbType="NVarChar(200)")]
public string ClientContactor
{
get
{
return this._ClientContactor;
}
set
{
if ((this._ClientContactor != value))
{
this.OnClientContactorChanging(value);
this.SendPropertyChanging();
this._ClientContactor = value;
this.SendPropertyChanged("ClientContactor");
this.OnClientContactorChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MobileTel", DbType="NVarChar(200)")]
public string MobileTel
{
get
{
return this._MobileTel;
}
set
{
if ((this._MobileTel != value))
{
this.OnMobileTelChanging(value);
this.SendPropertyChanging();
this._MobileTel = value;
this.SendPropertyChanged("MobileTel");
this.OnMobileTelChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanStartDate", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanStartDate
{
get
{
return this._PlanStartDate;
}
set
{
if ((this._PlanStartDate != value))
{
this.OnPlanStartDateChanging(value);
this.SendPropertyChanging();
this._PlanStartDate = value;
this.SendPropertyChanged("PlanStartDate");
this.OnPlanStartDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlanEndDate", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanEndDate
{
get
{
return this._PlanEndDate;
}
set
{
if ((this._PlanEndDate != value))
{
this.OnPlanEndDateChanging(value);
this.SendPropertyChanging();
this._PlanEndDate = value;
this.SendPropertyChanged("PlanEndDate");
this.OnPlanEndDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Accident_AccidentHandle_Base_Project", Storage="_Accident_AccidentHandle", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")]
public EntitySet<Accident_AccidentHandle> Accident_AccidentHandle
{
@ -284393,6 +284537,18 @@ namespace Model
private System.DateTime _CreateTime;
private string _StClientName;
private string _ClientContactor;
private string _MobileTel;
private System.Nullable<System.DateTime> _PlanStartDate;
private System.Nullable<System.DateTime> _PlanEndDate;
private string _StLocationName;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -284453,6 +284609,18 @@ namespace Model
partial void OnRealEndDateChanged();
partial void OnCreateTimeChanging(System.DateTime value);
partial void OnCreateTimeChanged();
partial void OnStClientNameChanging(string value);
partial void OnStClientNameChanged();
partial void OnClientContactorChanging(string value);
partial void OnClientContactorChanged();
partial void OnMobileTelChanging(string value);
partial void OnMobileTelChanged();
partial void OnPlanStartDateChanging(System.Nullable<System.DateTime> value);
partial void OnPlanStartDateChanged();
partial void OnPlanEndDateChanging(System.Nullable<System.DateTime> value);
partial void OnPlanEndDateChanged();
partial void OnStLocationNameChanging(string value);
partial void OnStLocationNameChanged();
#endregion
public PMP_Project()
@ -285020,6 +285188,126 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="stClientName", Storage="_StClientName", DbType="NVarChar(200)")]
public string StClientName
{
get
{
return this._StClientName;
}
set
{
if ((this._StClientName != value))
{
this.OnStClientNameChanging(value);
this.SendPropertyChanging();
this._StClientName = value;
this.SendPropertyChanged("StClientName");
this.OnStClientNameChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="clientContactor", Storage="_ClientContactor", DbType="NVarChar(200)")]
public string ClientContactor
{
get
{
return this._ClientContactor;
}
set
{
if ((this._ClientContactor != value))
{
this.OnClientContactorChanging(value);
this.SendPropertyChanging();
this._ClientContactor = value;
this.SendPropertyChanged("ClientContactor");
this.OnClientContactorChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="mobileTel", Storage="_MobileTel", DbType="NVarChar(200)")]
public string MobileTel
{
get
{
return this._MobileTel;
}
set
{
if ((this._MobileTel != value))
{
this.OnMobileTelChanging(value);
this.SendPropertyChanging();
this._MobileTel = value;
this.SendPropertyChanged("MobileTel");
this.OnMobileTelChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="planStartDate", Storage="_PlanStartDate", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanStartDate
{
get
{
return this._PlanStartDate;
}
set
{
if ((this._PlanStartDate != value))
{
this.OnPlanStartDateChanging(value);
this.SendPropertyChanging();
this._PlanStartDate = value;
this.SendPropertyChanged("PlanStartDate");
this.OnPlanStartDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="planEndDate", Storage="_PlanEndDate", DbType="DateTime")]
public System.Nullable<System.DateTime> PlanEndDate
{
get
{
return this._PlanEndDate;
}
set
{
if ((this._PlanEndDate != value))
{
this.OnPlanEndDateChanging(value);
this.SendPropertyChanging();
this._PlanEndDate = value;
this.SendPropertyChanged("PlanEndDate");
this.OnPlanEndDateChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="stLocationName", Storage="_StLocationName", DbType="NVarChar(20)")]
public string StLocationName
{
get
{
return this._StLocationName;
}
set
{
if ((this._StLocationName != value))
{
this.OnStLocationNameChanging(value);
this.SendPropertyChanging();
this._StLocationName = value;
this.SendPropertyChanged("StLocationName");
this.OnStLocationNameChanged();
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -424135,6 +424423,8 @@ namespace Model
private string _StatesStr;
private string _ConfirmStr;
private string _RegisterTypesId;
private string _RegisterTypesName;
@ -424907,6 +425197,22 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConfirmStr", DbType="VarChar(6) NOT NULL", CanBeNull=false)]
public string ConfirmStr
{
get
{
return this._ConfirmStr;
}
set
{
if ((this._ConfirmStr != value))
{
this._ConfirmStr = value;
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RegisterTypesId", DbType="NVarChar(50)")]
public string RegisterTypesId
{

12
SGGL/Model/NPOIImg.cs Normal file
View File

@ -0,0 +1,12 @@

namespace Model
{
public class NPOIImg
{
public string SavePath { get; set; }
public int Row { get; set; }
public int Col { get; set; }
}
}

15
SGGL/Model/PMP/PMPOBS.cs
View File

@ -115,6 +115,21 @@ namespace Model
}
/// <summary>
/// 项目OBS输出信息
/// </summary>
public partial class PMPOBSOutInput
{
/// <summary>
/// 岗位专业名称
/// </summary>
public string workName { get; set; }
/// <summary>
/// 对应岗位专业任职人员名称
/// </summary>
public string userName { get; set; }
}
public partial class PMPOBSResponseData
{

126
SGGL/Model/PMP/PMPProject.cs
View File

@ -103,11 +103,16 @@ namespace Model
[JsonProperty("stNum")]
public string stNum { get; set; }
/// <summary>
/// 名称
/// 项目名称
/// </summary>
[JsonProperty("name")]
public string name { get; set; }
/// <summary>
/// 项目英文名称
/// </summary>
[JsonProperty("projectNameEn")]
public string projectNameEn { get; set; }
/// <summary>
/// 项目简称
/// </summary>
[JsonProperty("projShortName")]
@ -123,22 +128,47 @@ namespace Model
[JsonProperty("realEndDate")]
public DateTime? realEndDate { get; set; }
/// <summary>
/// 计划开始日期
/// </summary>
[JsonProperty("planStartDate")]
public DateTime? planStartDate { get; set; }
/// <summary>
/// 计划结束日期
/// </summary>
[JsonProperty("planEndDate")]
public DateTime? planEndDate { get; set; }
/// <summary>
/// 业主名称
/// </summary>
[JsonProperty("stClientName")]
public string stClientName { get; set; }
/// <summary>
/// 业主联系人
/// </summary>
[JsonProperty("clientContactor")]
public string clientContactor { get; set; }
/// <summary>
/// 业主联系人电话
/// </summary>
[JsonProperty("mobileTel")]
public string mobileTel { get; set; }
/// <summary>
/// 操作类型
/// </summary>
[JsonProperty("disType")]
public string disType { get; set; }
///// <summary>
///// 项目类型名称（一级）【控制软件项目类型】
///// </summary>
//[JsonProperty("projName")]
//public string projName { get; set; }
///// <summary>
///// 项目类型名称（二级）
///// </summary>
//[JsonProperty("projTypeName")]
//public string projTypeName { get; set; }
/// <summary>
/// 项目阶段编码
/// </summary>
[JsonProperty("projStepZxnoCode")]
public string projStepZxnoCode { get; set; }
/// <summary>
/// 项目阶段名称
/// </summary>
[JsonProperty("projStepZxnoName")]
public string projStepZxnoName { get; set; }
/// <summary>
/// 项目类型一级
/// 项目类型一级【控制软件项目类型】
/// </summary>
[JsonProperty("stProjectTypeVals")]
public string stProjectTypeVals { get; set; }
@ -147,11 +177,31 @@ namespace Model
/// </summary>
[JsonProperty("stProjectStepVals")]
public string stProjectStepVals { get; set; }
///// <summary>
///// 项目阶段名称【控制软件项目阶段】
///// </summary>
//[JsonProperty("projStepName")]
//public string projStepName { get; set; }
/// <summary>
/// 项目阶段编码
/// </summary>
[JsonProperty("projStepZxnoCode")]
public string projStepZxnoCode { get; set; }
/// <summary>
/// 项目阶段名称【控制软件项目阶段】
/// </summary>
[JsonProperty("projStepZxnoName")]
public string projStepZxnoName { get; set; }
/// <summary>
/// 项目阶段
/// </summary>
[JsonProperty("projStepZxnoVals")]
public string projStepZxnoVals { get; set; }
///// <summary>
///// 项目性质名称
///// </summary>
//[JsonProperty("projPropName")]
//public string projPropName { get; set; }
/// <summary>
/// 项目性质
/// </summary>
@ -163,20 +213,10 @@ namespace Model
[JsonProperty("remarkC")]
public string remarkC { get; set; }
/// <summary>
/// 详细地址
/// 建设地点名称（境内、境外）
/// </summary>
[JsonProperty("address")]
public string address { get; set; }
/// <summary>
/// 市编码
/// </summary>
[JsonProperty("cityCode")]
public string cityCode { get; set; }
/// <summary>
/// 市名称
/// </summary>
[JsonProperty("cityName")]
public string cityName { get; set; }
[JsonProperty("stLocationName")]
public string stLocationName { get; set; }
/// <summary>
/// 国家编码
/// </summary>
@ -188,6 +228,26 @@ namespace Model
[JsonProperty("countryName")]
public string countryName { get; set; }
/// <summary>
/// 省编码
/// </summary>
[JsonProperty("provinceCode")]
public string provinceCode { get; set; }
/// <summary>
/// 省名称
/// </summary>
[JsonProperty("provinceName")]
public string provinceName { get; set; }
/// <summary>
/// 市编码
/// </summary>
[JsonProperty("cityCode")]
public string cityCode { get; set; }
/// <summary>
/// 市名称
/// </summary>
[JsonProperty("cityName")]
public string cityName { get; set; }
/// <summary>
/// 区县编码
/// </summary>
[JsonProperty("countyCode")]
@ -198,20 +258,10 @@ namespace Model
[JsonProperty("countyName")]
public string countyName { get; set; }
/// <summary>
/// 项目英文名称
/// 详细地址
/// </summary>
[JsonProperty("projectNameEn")]
public string projectNameEn { get; set; }
/// <summary>
/// 省编码
/// </summary>
[JsonProperty("provinceCode")]
public string provinceCode { get; set; }
/// <summary>
/// 省名称
/// </summary>
[JsonProperty("provinceName")]
public string provinceName { get; set; }
[JsonProperty("address")]
public string address { get; set; }
/// <summary>
/// 经度
/// </summary>

282
SGGL/WebAPI/Controllers/JGZL/JGZLController.cs Normal file
View File

@ -0,0 +1,282 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web.Http;
using Model;
using BLL;
namespace WebAPI.Controllers.JGZL
{
public class JGZLController : ApiController
{
#region 用户基本数据,单位,项目,单位工程,签审岗位(无),机构(无)
/// <summary>
/// 用户基本数据,单位,项目,单位工程,签审岗位(无),机构(无)
/// </summary>
/// <returns></returns>
public Model.ResponeData getUserList(string UserName,int? PageIndex,int? PageSize)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var responeData = new Model.ResponeData();
try
{
var getUserListQuery = from x in db.Sys_User
join u in db.Base_Unit on x.UnitId equals u.UnitId into uGrouped
from ug in uGrouped.DefaultIfEmpty()
select new
{
x.UserId,
x.Account,
x.UserName,
x.Telephone,
x.IdentityCard,
x.BirthDay,
x.Email,
x.IsPost,
x.Sex,
ug.UnitId,
ug.UnitName,
ProjectItems = from proj in db.Base_Project
join pu in db.Project_ProjectUser on proj.ProjectId equals pu.ProjectId
where pu.UserId == x.UserId
select new
{
proj.ProjectId,
proj.ProjectName,
pu.WorkAreaId // 假设 WorkAreaId 是 UnitWorkIds 的来源
}
};
var getList = getUserListQuery.AsEnumerable()
.Select(user => new UserItem
{
UserId = user.UserId,
Account = user.Account,
UserName = user.UserName,
Telephone = user.Telephone,
IdentityCard = user.IdentityCard,
BirthDay = user.BirthDay,
Email = user.Email,
IsPost = user.IsPost,
Sex = user.Sex,
UnitId = user.UnitId,
UnitName = user.UnitName,
ProjectItemList = user.ProjectItems.Select(projectItem => new ProjectItem
{
ProjectId = projectItem.ProjectId,
ProjectName = projectItem.ProjectName,
UnitWorkItemList = string.IsNullOrEmpty(projectItem.WorkAreaId)
? new List<UnitWorkItem>()
: db.WBS_UnitWork
.Where(uw => projectItem.WorkAreaId.Split(',')
.Contains(uw.UnitWorkId))
.Select(uw => new UnitWorkItem
{
UnitWorkId = uw.UnitWorkId,
UnitWorkName = uw.UnitWorkName
})
.ToList()
}).ToList()
}).ToList();
if (!string.IsNullOrEmpty(UserName))
{
getList = getList.Where(x => x.UserName.Contains(UserName)).ToList();
}
if (PageIndex > 0 && PageSize > 0)
{
getList = getList.Skip(((int)PageIndex - 1) * (int)PageSize).Take((int)PageSize).ToList();
}
responeData.data = new { getList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
#endregion
#region 项目数据
/// <summary>
/// 项目数据
/// </summary>
/// <returns></returns>
public Model.ResponeData getProjedtList()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var responeData = new Model.ResponeData();
try
{
var getList = (from x in db.Base_Project
select new
{
x.ProjectId,
x.ProjectCode,
x.ProjectName,
x.StartDate,
}).ToList();
responeData.data = new { getList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
#endregion
#region 根据项目获取单位工程数据
/// <summary>
/// 根据项目获取单位工程数据
/// </summary>
/// <returns></returns>
public Model.ResponeData getUnitWorkListByProjectId(string ProjectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var responeData = new Model.ResponeData();
try
{
var getList = (from x in db.WBS_UnitWork
where x.ProjectId==ProjectId
select new
{
x.UnitWorkId,
x.UnitWorkName,
x.UnitWorkCode,
}).ToList();
responeData.data = new { getList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
#endregion
#region 根据项目获取装置数据
/// <summary>
/// 根据项目获取装置数据
/// </summary>
/// <returns></returns>
public Model.ResponeData getInstallationListByProjectId(string ProjectId)
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var responeData = new Model.ResponeData();
try
{
var getList = (from x in db.Project_Installation
where x.ProjectId==ProjectId
select new
{
x.InstallationId,
x.InstallationName,
x.InstallationCode,
}).ToList();
responeData.data = new { getList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
#endregion
#region 单位数据
/// <summary>
/// 单位数据
/// </summary>
/// <returns></returns>
public Model.ResponeData getUnitList()
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var responeData = new Model.ResponeData();
try
{
var getList = (from x in db.Base_Unit
select new
{
x.UnitId,
x.UnitCode,
x.UnitName,
}).ToList();
responeData.data = new { getList };
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.Message;
}
return responeData;
}
}
#endregion
public class UserItem
{
public string UserId { get; set; }
public string Account { get; set; }
public string UserName { get; set; }
public string Telephone { get; set; }
public string IdentityCard { get; set; }
public DateTime? BirthDay { get; set; }
public string Email { get; set; }
public System.Nullable<bool> IsPost { get; set; }
public string Sex { get; set; }
public string UnitId { get; set; }
public string UnitName { get; set; }
public List<ProjectItem> ProjectItemList { get; set; }
}
public class ProjectItem
{
public string ProjectId { get; set; }
public string ProjectName { get; set; }
public List<UnitWorkItem> UnitWorkItemList { get; set; }
}
public class UnitWorkItem
{
public string UnitWorkId { get; set; }
public string UnitWorkName { get; set; }
}
}
}

33
SGGL/WebAPI/Controllers/PMP/PMPController.cs Normal file
View File

@ -0,0 +1,33 @@
using BLL;
using System;
using System.Web.Http;
namespace WebAPI.Controllers
{
/// <summary>
/// 五环PMP系统
/// </summary>
public class PMPController : ApiController
{
/// <summary>
/// 每天夜间同步获取PMP系统项目数据
/// </summary>
/// <returns></returns>
[HttpPost]
public Model.ResponeData SynPMPProjectData()
{
var responeData = new Model.ResponeData();
try
{
PMPDataService.GetPMPProjectMasterData();
}
catch (Exception ex)
{
responeData.code = 0;
responeData.message = ex.ToString();
}
return responeData;
}
}
}

9
SGGL/WebAPI/Filter/TestPermissionAttribute.cs
View File

@ -86,7 +86,14 @@ namespace WebAPI.Filter
/// <summary>
///
/// </summary>
public static List<string> lists = new List<string> { "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount", "HazardRegister*getHazardRegisterByProjectIdStates", "upload*attendance" };
public static List<string> lists = new List<string> { "PMP*SynPMPProjectData", "GJSX*OverdueWarningSendEmail", "User*postLoginOn", "get*token", "HazardRegister*getHazardRegisterTotalCount",
"HazardRegister*getHazardRegisterByProjectIdStates",
"JGZL*getUserList",
"JGZL*getProjedtList",
"JGZL*getUnitWorkListByProjectId",
"JGZL*getInstallationListByProjectId",
"JGZL*getUnitList",
"upload*attendance" };
/// <summary>
///

22
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>E:\诺必达合肥\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-03-13T08:44:25.3220313Z||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<History>True|2025-04-07T08:11:44.5172315Z||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>03/13/2025 16:44:23</publishTime>
<publishTime>04/07/2025 16:11:41</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>03/13/2025 16:44:23</publishTime>
<publishTime>04/07/2025 16:11:41</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>03/13/2025 16:44:14</publishTime>
<publishTime>04/07/2025 16:11:19</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>03/13/2025 16:44:14</publishTime>
<publishTime>04/07/2025 16:11:19</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -128,10 +128,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>03/13/2025 10:57:48</publishTime>
<publishTime>04/07/2025 16:11:13</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>03/13/2025 10:57:48</publishTime>
<publishTime>04/07/2025 16:11:13</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>07/04/2024 14:13:01</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>03/13/2025 16:44:14</publishTime>
<publishTime>04/07/2025 16:11:22</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>03/13/2025 16:44:14</publishTime>
<publishTime>04/07/2025 16:11:22</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>03/13/2025 16:44:14</publishTime>
<publishTime>04/07/2025 16:11:22</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>03/13/2025 16:44:15</publishTime>
<publishTime>04/07/2025 16:11:23</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>

2
SGGL/WebAPI/WebAPI.csproj
View File

@ -165,6 +165,7 @@
<Compile Include="Controllers\HSSE\GeneralEquipmentQualityController.cs" />
<Compile Include="Controllers\HSSE\HSSELogController.cs" />
<Compile Include="Controllers\HSSE\TestingController.cs" />
<Compile Include="Controllers\JGZL\JGZLController.cs" />
<Compile Include="Controllers\Person\PersonCheckController.cs" />
<Compile Include="Controllers\CQMS\CheckEquipmentController.cs" />
<Compile Include="Controllers\CQMS\CheckListController.cs" />
@ -217,6 +218,7 @@
<Compile Include="Controllers\FileUploadController.cs" />
<Compile Include="Controllers\HomeController.cs" />
<Compile Include="Controllers\PersonController.cs" />
<Compile Include="Controllers\PMP\PMPController.cs" />
<Compile Include="Controllers\ProjectController.cs" />
<Compile Include="Controllers\PZHGL\GJSXController.cs" />
<Compile Include="Controllers\TestRun\DriverRunController.cs" />