From 1e709abb1a9390cb25d7852aea6061b1f49ad854 Mon Sep 17 00:00:00 2001
From: gaofei <181547018@qq.com>
Date: Mon, 19 Jun 2023 09:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=9B=86=E5=9B=A2=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E7=A9=BF=E9=80=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../版本日志/SGGLDB_CD_V2023-06-17-001.sql | 423 ++++
SGGL/BLL/BLL.csproj | 22 +-
SGGL/BLL/BaseInfo/CertificateService.cs | 4 +
SGGL/BLL/BaseInfo/RiskLevelService.cs | 122 +
.../Comprehensive/DesignDetailsService.cs | 2 +
.../Comprehensive/InspectionMachineService.cs | 2 +
.../Comprehensive/InspectionPersonService.cs | 2 +
SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs | 2 +
SGGL/BLL/CQMS/WBS/BreakdownService.cs | 3 +
SGGL/BLL/CQMS/WBS/DivisionProjectService.cs | 12 +-
SGGL/BLL/CQMS/WBS/DivisionService.cs | 2 +
SGGL/BLL/Common/Const.cs | 16 +
SGGL/BLL/Common/IDCardValid.cs | 45 +
.../Accident/AccidentPersonRecordService.cs | 4 +-
.../HSSE/Accident/AccidentReportService.cs | 2 +
.../Hazard_HazardSelectedItemService.cs | 50 +-
.../HSSE/Hazard/Hazard_PatrolPlanService.cs | 96 +
.../Hazard/Hazard_RoutingInspectionService.cs | 95 +
.../Hazard/RiskEvaluationRecordService.cs | 109 +
.../EquipmentInItemService.cs | 4 +-
.../GeneralEquipmentInItemService.cs | 4 +-
.../BLL/HSSE/License/LicenseManagerService.cs | 8 +-
SGGL/BLL/HSSE/SitePerson/PersonService.cs | 89 +
SGGL/BLL/HSSE/Solution/LargerHazardService.cs | 4 +
SGGL/BLL/SysManage/UnitService.cs | 2 +-
SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx | 51 +-
.../BaseInfo/Certificate.aspx.cs | 14 +
.../BaseInfo/Certificate.aspx.designer.cs | 18 +
SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx | 100 +
SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.cs | 240 ++
.../BaseInfo/RiskLevel.aspx.designer.cs | 143 ++
.../FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx | 73 +
.../BaseInfo/RiskLevelEdit.aspx.cs | 118 +
.../BaseInfo/RiskLevelEdit.aspx.designer.cs | 143 ++
.../CQMS/Comprehensive/DesignDetailsEdit.aspx | 6 +
.../Comprehensive/DesignDetailsEdit.aspx.cs | 7 +-
.../DesignDetailsEdit.aspx.designer.cs | 60 +-
.../CQMS/Comprehensive/InspectionMachine.aspx | 2 +-
.../Comprehensive/InspectionMachineEdit.aspx | 48 +-
.../InspectionMachineEdit.aspx.cs | 7 +-
.../InspectionMachineEdit.aspx.designer.cs | 77 +-
.../Comprehensive/InspectionPersonEdit.aspx | 4 +
.../InspectionPersonEdit.aspx.cs | 19 +-
.../InspectionPersonEdit.aspx.designer.cs | 77 +-
.../FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx | 13 +-
.../CQMS/WBS/EditBreakdown.aspx.cs | 45 +-
.../CQMS/WBS/EditBreakdown.aspx.designer.cs | 9 +
.../CQMS/WBS/EditBreakdownProject.aspx | 13 +-
.../CQMS/WBS/EditBreakdownProject.aspx.cs | 11 +
.../WBS/EditBreakdownProject.aspx.designer.cs | 9 +
SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx | 10 +
.../CQMS/WBS/EditDivision.aspx.cs | 57 +-
.../CQMS/WBS/EditDivision.aspx.designer.cs | 9 +
.../CQMS/WBS/EditDivisionProject.aspx | 10 +
.../CQMS/WBS/EditDivisionProject.aspx.cs | 12 +
.../WBS/EditDivisionProject.aspx.designer.cs | 9 +
.../CQMS/WBS/ProjectControlPoint.aspx.cs | 110 +-
SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs | 2 +-
SGGL/FineUIPro.Web/DataShow/Check.aspx.cs | 2 +-
.../DataShow/CompanyPerson.aspx.cs | 4 +-
.../DataShow/ConstructionEquipment.aspx.cs | 2 +-
.../FineUIPro.Web/DataShow/Environmental.aspx | 2 +-
.../FineUIPro.Web/DataShow/HJGLDefect.aspx.cs | 6 +-
.../DataShow/HJGLWelding.aspx.cs | 2 +-
.../DataShow/HiddenRectification.aspx.cs | 2 +-
.../DataShow/HiddenRectificationItem.aspx.cs | 4 +-
.../DataShow/LargeEngineering.aspx.cs | 2 +-
SGGL/FineUIPro.Web/DataShow/License.aspx.cs | 2 +-
SGGL/FineUIPro.Web/DataShow/Project.aspx.cs | 2 +-
.../FineUIPro.Web/DataShow/ProjectPerson.aspx | 2 +-
.../DataShow/QualityAcceptance.aspx | 4 +-
.../DataShow/QualityAcceptance.aspx.cs | 4 +-
.../DataShow/QualityControlPoint.aspx | 2 +-
.../DataShow/QualityControlPoint.aspx.cs | 2 +-
.../DataShow/QualityInstruments.aspx.cs | 2 +-
.../DataShow/QualityPerson.aspx.cs | 2 +-
.../DataShow/QualityProblem.aspx.cs | 2 +-
.../DataShow/QualityProblemItem.aspx.cs | 4 +-
.../DataShow/QualityTraining.aspx.cs | 2 +-
.../DataShow/SecurityRisk.aspx.cs | 2 +-
.../DataShow/SecurityRiskItem.aspx.cs | 2 +-
.../DataShow/WorkingHours.aspx.cs | 14 +-
SGGL/FineUIPro.Web/ErrLog.txt | 2031 ++---------------
SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 85 +-
.../HSSE/Accident/AccidentPersonRecord.aspx | 8 +-
.../Accident/AccidentPersonRecord.aspx.cs | 4 +-
.../Accident/AccidentPersonRecordEdit.aspx | 22 +-
.../Accident/AccidentPersonRecordEdit.aspx.cs | 70 +-
.../AccidentPersonRecordEdit.aspx.designer.cs | 90 +-
.../Accident/AccidentPersonRecordView.aspx | 12 +-
.../Accident/AccidentPersonRecordView.aspx.cs | 3 -
.../AccidentPersonRecordView.aspx.designer.cs | 18 -
.../HSSE/Accident/AccidentReport.aspx | 10 +-
.../HSSE/Accident/AccidentReport.aspx.cs | 6 +-
.../HSSE/Accident/AccidentReportEdit.aspx | 368 ++-
.../HSSE/Accident/AccidentReportEdit.aspx.cs | 71 +-
.../AccidentReportEdit.aspx.designer.cs | 85 +-
.../HSSE/Accident/AccidentReportView.aspx | 6 +-
.../HSSE/Accident/AccidentReportView.aspx.cs | 10 -
.../AccidentReportView.aspx.designer.cs | 9 -
.../FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx | 186 ++
.../HSSE/Hazard/HazardInfo.aspx.cs | 436 ++++
.../HSSE/Hazard/HazardInfo.aspx.designer.cs | 213 ++
.../HSSE/Hazard/HazardInfoEdit.aspx | 108 +
.../HSSE/Hazard/HazardInfoEdit.aspx.cs | 251 ++
.../Hazard/HazardInfoEdit.aspx.designer.cs | 222 ++
.../FineUIPro.Web/HSSE/Hazard/HazardList.aspx | 12 +-
.../HSSE/Hazard/HazardList.aspx.cs | 77 +-
.../HSSE/Hazard/HazardListEdit.aspx | 59 +-
.../HSSE/Hazard/HazardListEdit.aspx.cs | 102 +-
.../Hazard/HazardListEdit.aspx.designer.cs | 114 +-
.../HSSE/Hazard/HazardListView.aspx | 8 +-
.../HSSE/Hazard/HazardListView.aspx.cs | 14 +-
.../Hazard/HazardListView.aspx.designer.cs | 102 +-
.../HSSE/Hazard/HazardReEvaluator.aspx | 108 +
.../HSSE/Hazard/HazardReEvaluator.aspx.cs | 302 +++
.../Hazard/HazardReEvaluator.aspx.designer.cs | 222 ++
.../HSSE/Hazard/HazardTemplate.aspx.cs | 4 +-
.../HSSE/Hazard/MajorHazardList.aspx | 4 +-
.../HSSE/Hazard/MajorHazardList.aspx.cs | 15 +-
.../HSSE/Hazard/RiskControl.aspx | 204 ++
.../HSSE/Hazard/RiskControl.aspx.cs | 466 ++++
.../HSSE/Hazard/RiskControl.aspx.designer.cs | 231 ++
.../HSSE/Hazard/RoutingInspection.aspx | 178 ++
.../HSSE/Hazard/RoutingInspection.aspx.cs | 423 ++++
.../Hazard/RoutingInspection.aspx.designer.cs | 195 ++
.../HSSE/Hazard/RoutingInspectionEdit.aspx | 104 +
.../HSSE/Hazard/RoutingInspectionEdit.aspx.cs | 328 +++
.../RoutingInspectionEdit.aspx.designer.cs | 204 ++
.../HSSE/Hazard/RoutingInspectionView.aspx | 101 +
.../HSSE/Hazard/RoutingInspectionView.aspx.cs | 164 ++
.../RoutingInspectionView.aspx.designer.cs | 195 ++
.../HSSE/Hazard/SetToolTipTime.aspx.cs | 1 +
.../HiddenRectificationAdd.aspx | 6 +-
.../HiddenRectificationConfirm.aspx | 6 +-
.../HiddenRectificationRectify.aspx | 6 +-
.../HiddenRectificationView.aspx | 6 +-
.../HSSE/InApproveManager/EquipmentIn.aspx | 74 +-
.../HSSE/InApproveManager/EquipmentIn.aspx.cs | 117 +-
.../EquipmentIn.aspx.designer.cs | 40 +-
.../InApproveManager/EquipmentInEdit.aspx | 27 +-
.../InApproveManager/EquipmentInEdit.aspx.cs | 42 +-
.../EquipmentInEdit.aspx.designer.cs | 36 +-
.../InApproveManager/EquipmentInItemEdit.aspx | 9 +-
.../EquipmentInItemEdit.aspx.cs | 8 +-
.../EquipmentInItemEdit.aspx.designer.cs | 9 +
.../InApproveManager/EquipmentInView.aspx | 21 +-
.../InApproveManager/EquipmentInView.aspx.cs | 5 +-
.../EquipmentInView.aspx.designer.cs | 18 -
.../HSSE/License/LicenseManager.aspx | 23 +-
.../HSSE/License/LicenseManager.aspx.cs | 6 +-
.../HSSE/License/LicenseManagerEdit.aspx | 20 +-
.../HSSE/License/LicenseManagerEdit.aspx.cs | 45 +-
.../LicenseManagerEdit.aspx.designer.cs | 36 +-
.../HSSE/License/LicenseManagerView.aspx | 5 +-
.../HSSE/License/LicenseManagerView.aspx.cs | 4 +
.../LicenseManagerView.aspx.designer.cs | 9 +
.../HSSE/SitePerson/PersonList.aspx | 2 +-
.../HSSE/SitePerson/PersonListEdit.aspx | 3 +-
.../HSSE/SitePerson/PersonListEdit.aspx.cs | 5 +
.../PersonListEdit.aspx.designer.cs | 149 +-
.../HSSE/Solution/LargerHazardEdit.aspx | 33 +-
.../HSSE/Solution/LargerHazardEdit.aspx.cs | 60 +-
.../LargerHazardEdit.aspx.designer.cs | 54 +-
.../HSSE/Solution/LargerHazardList.aspx | 227 +-
.../HSSE/Solution/LargerHazardList.aspx.cs | 150 +-
.../LargerHazardList.aspx.designer.cs | 106 +-
.../HSSE/Solution/LargerHazardView.aspx | 16 +-
.../HSSE/Solution/LargerHazardView.aspx.cs | 13 +
.../LargerHazardView.aspx.designer.cs | 27 +
SGGL/FineUIPro.Web/Web.config | 120 +-
.../ZHGL/Emergency/DrillRecordList.aspx.cs | 12 +-
.../Emergency/DrillRecordListEdit.aspx.cs | 2 +-
.../ZHGL/Emergency/EmergencyList.aspx.cs | 24 +-
.../ZHGL/Emergency/EmergencyListEdit.aspx.cs | 2 +-
.../ZHGL/Person/ProjectPerson.aspx | 150 ++
.../ZHGL/Person/ProjectPerson.aspx.cs | 182 ++
.../Person/ProjectPerson.aspx.designer.cs | 195 ++
SGGL/FineUIPro.Web/common/Menu_CQMS.xml | 1 +
SGGL/FineUIPro.Web/common/Menu_HSSE.xml | 14 +-
SGGL/FineUIPro.Web/common/Menu_SysSet.xml | 1 +
SGGL/FineUIPro.Web/common/PageBase.cs | 28 +
SGGL/FineUIPro.Web/packages.config | 1 +
SGGL/Model/Model.cs | 1268 +++++++++-
184 files changed, 10777 insertions(+), 3631 deletions(-)
create mode 100644 DataBase/版本日志/SGGLDB_CD_V2023-06-17-001.sql
create mode 100644 SGGL/BLL/BaseInfo/RiskLevelService.cs
create mode 100644 SGGL/BLL/HSSE/Hazard/Hazard_PatrolPlanService.cs
create mode 100644 SGGL/BLL/HSSE/Hazard/Hazard_RoutingInspectionService.cs
create mode 100644 SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardInfo.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardInfoEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardInfoEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardInfoEdit.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardReEvaluator.aspx
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardReEvaluator.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/HazardReEvaluator.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RiskControl.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspection.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionEdit.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/HSSE/Hazard/RoutingInspectionView.aspx.designer.cs
create mode 100644 SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx
create mode 100644 SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx.cs
create mode 100644 SGGL/FineUIPro.Web/ZHGL/Person/ProjectPerson.aspx.designer.cs
diff --git a/DataBase/版本日志/SGGLDB_CD_V2023-06-17-001.sql b/DataBase/版本日志/SGGLDB_CD_V2023-06-17-001.sql
new file mode 100644
index 00000000..fbfbde5d
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_CD_V2023-06-17-001.sql
@@ -0,0 +1,423 @@
+
+
+update InApproveManager_EquipmentInItem set IsUsed=1
+update InApproveManager_GeneralEquipmentInItem set IsUsed=1
+GO
+
+
+ALTER VIEW [dbo].[View_License_LicenseManager]
+AS
+/*ֳȫ֤*/
+SELECT LicenseManager.LicenseManagerId,
+ LicenseManager.ProjectId,
+ LicenseManager.LicenseTypeId,
+ LicenseManager.LicenseManagerCode,
+ LicenseManager.LicenseManageName,
+ LicenseManager.UnitId,
+ LicenseManager.LicenseManageContents,
+ LicenseManager.CompileMan,
+ LicenseManager.CompileDate,
+ LicenseManager.States,
+ Project.ProjectCode,
+ Project.ProjectName,
+ LicenseType.LicenseTypeName,
+ Unit.UnitName,
+ UnitType.UnitTypeId,
+ UnitType.UnitTypeName,
+ Users.UserName,
+ LicenseManager.WorkAreaId,
+ --WorkArea.WorkAreaName,
+ LicenseManager.StartDate,
+ LicenseManager.EndDate,
+ LicenseManager.ApplicantMan,
+ LicenseManager.IsHighRisk,
+ LicenseManager.WorkStates,
+ case LicenseManager.WorkStates when '1' then ''
+ when '2' then 'ҵ'
+ when '3' then 'ѹر'
+ when '-1' then 'ȡ'
+ else '' end as WorkStatesStr,
+ WorkAreaName = STUFF(( SELECT ',' + UnitWorkName FROM WBS_UnitWork
+ where PATINDEX('%,' + RTRIM(WBS_UnitWork.UnitWorkId) + ',%',',' + LicenseManager.WorkAreaId + ',')>0
+ ORDER BY PATINDEX('%,' + RTRIM(LicenseManager.WorkAreaId) + ',%',',' + LicenseManager.WorkAreaId + ',')
+ FOR XML PATH('')), 1, 1,'')
+FROM dbo.License_LicenseManager AS LicenseManager
+LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = LicenseManager.ProjectId
+LEFT JOIN dbo.Base_LicenseType AS LicenseType ON LicenseType.LicenseTypeId = LicenseManager.LicenseTypeId
+LEFT JOIN dbo.Base_Unit AS Unit ON Unit.UnitId = LicenseManager.UnitId
+LEFT JOIN dbo.Sys_User AS Users ON Users.UserId = LicenseManager.CompileMan
+LEFT JOIN dbo.WBS_UnitWork AS WorkArea ON WorkArea.UnitWorkId = LicenseManager.WorkAreaId
+LEFT JOIN dbo.Base_UnitType as UnitType ON UnitType.UnitTypeId=Unit.UnitTypeId
+
+
+
+GO
+
+
+update License_LicenseManager set WorkStates='3'
+GO
+
+update HSSE_Hazard_HazardRegister set Risk_Level='һ'
+GO
+
+
+/**********Ѳ죨ֻˣͼ*************/
+ALTER VIEW [dbo].[View_Hazard_HazardRegister]
+AS
+SELECT Registration.HazardRegisterId,
+ Registration.HazardCode,
+ Registration.RegisterDate,
+ Registration.RegisterDef,
+ Registration.Rectification,
+ Registration.Place,
+ Registration.ResponsibleUnit,
+ Registration.Observer,
+ Registration.Risk_Level,
+ Registration.RectifiedDate,
+ Registration.ProjectId,
+ Project.UnitId AS PUnitId,
+ ProjectUnit.UnitName AS PUnitName,
+ Registration.states,
+ Registration.IsEffective,
+ Registration.ResponsibleMan,
+ Registration.CheckManId,
+ Registration.CheckTime,
+ Registration.RectificationPeriod,
+ Registration.ImageUrl,
+ Registration.RectificationImageUrl,
+ Registration.RectificationTime,
+ Registration.ConfirmMan,
+ Registration.ConfirmDate,
+ Registration.HandleIdea,
+ Registration.CutPayment,
+ Registration.ProblemTypes,
+ Registration.CheckSpecialId,
+ Registration.CheckItemDetailId,
+ Registration.SupCheckItemSetId,
+ Registration.CheckItemSetId,
+ Registration.SafeSupervisionId,
+ Registration.SafeSupervisionIsOK,
+ Project.ProjectName,
+ Registration.CheckCycle,
+ ISNULL(WorkArea.UnitWorkName,'') AS WorkAreaName,
+ Unit.UnitName as ResponsibilityUnitName,
+ User1.UserName AS ResponsibilityManName,
+ ISNULL(User1.Telephone,'') AS ResponsibilityManTel,
+ User2.UserName AS CheckManName,
+ ISNULL(User2.Telephone,'') AS CheckManTel,
+ User2.UnitId AS SendUnitId,
+ User3.UserName AS ConfirmManName,
+ ISNULL(User3.Telephone,'') AS ConfirmManTel,
+ User4.UserName AS ResponsibilityManName2,
+ ISNULL(User4.Telephone,'') AS ResponsibilityMan2Tel,
+ (CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN ''
+ WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN 'ϸ'
+ WHEN Registration.states='2' THEN '-'
+ WHEN Registration.states='3' THEN 'ѱջ'
+ ELSE '' END ) AS StatesStr,
+ RegisterTypes.RegisterTypesId,
+ RegisterTypes.RegisterTypesName,
+ Registration.DIC_ID,
+ Registration.CCManIds,
+ CCManNames = STUFF(( SELECT ',' + UserName FROM Sys_User
+ where PATINDEX('%,' + RTRIM(Sys_User.UserId) + ',%',',' + Registration.CCManIds + ',')>0
+ ORDER BY PATINDEX('%,' + RTRIM(Registration.CCManIds) + ',%',',' + Registration.CCManIds + ',')
+ FOR XML PATH('')), 1, 1,''),
+ Registration.Requirements
+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
+
+
+
+
+delete from Sys_Menu where MenuId='9A3212F8-2392-4F21-A8C7-FF5EE3B191F1'
+delete from Sys_ButtonToMenu where MenuId='762F0BF9-471B-4115-B35E-03A26C573877'
+delete from Sys_Menu where MenuId='762F0BF9-471B-4115-B35E-03A26C573877'
+delete from Sys_ButtonToMenu where MenuId='EDC50857-7762-4498-83C6-5BDE85036BAB'
+delete from Sys_Menu where MenuId='EDC50857-7762-4498-83C6-5BDE85036BAB'
+delete from Sys_ButtonToMenu where MenuId='74A6B343-5837-416B-AE9C-D2BBCA08E41F'
+delete from Sys_Menu where MenuId='74A6B343-5837-416B-AE9C-D2BBCA08E41F'
+delete from Sys_ButtonToMenu where MenuId='F6A6D53A-150E-43DB-A3C4-6FA18E9401E9'
+delete from Sys_Menu where MenuId='F6A6D53A-150E-43DB-A3C4-6FA18E9401E9'
+delete from Sys_ButtonToMenu where MenuId='D256E5C8-DC76-4F4D-BABE-A253418823F4'
+delete from Sys_Menu where MenuId='D256E5C8-DC76-4F4D-BABE-A253418823F4'
+delete from Sys_ButtonToMenu where MenuId='94C36333-C22A-499F-B9DB-53EEF77922AE'
+delete from Sys_Menu where MenuId='94C36333-C22A-499F-B9DB-53EEF77922AE'
+delete from Sys_ButtonToMenu where MenuId='E22F555A-D41C-4F5F-9734-39B578957732'
+delete from Sys_Menu where MenuId='E22F555A-D41C-4F5F-9734-39B578957732'
+GO
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('9A3212F8-2392-4F21-A8C7-FF5EE3B191F1' ,'շּ̬ܿ',null,'',50,'467A0CB9-737D-4451-965E-869EBC3A4BD6', 'Menu_HSSE',0,0,1)
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('762F0BF9-471B-4115-B35E-03A26C573877' ,'ʶ',null,'HSSE/Hazard/EnvironmentalRiskList.aspx',10,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('25E47331-0E20-47B0-AAC3-926C0444D9C9', '762F0BF9-471B-4115-B35E-03A26C573877' ,'' ,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('25705A8C-A734-4D56-8C30-4D08578B37F3', '762F0BF9-471B-4115-B35E-03A26C573877' ,'' ,2)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('8485EACC-BEE1-4BED-95CE-A10AA53372D1', '762F0BF9-471B-4115-B35E-03A26C573877' ,'ɾ' ,3)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('4DEF4A6D-77BD-4192-896D-6AB88BFA8F91', '762F0BF9-471B-4115-B35E-03A26C573877' ,'' ,4)
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('EDC50857-7762-4498-83C6-5BDE85036BAB' ,'',null,'HSSE/Hazard/HazardList.aspx',20,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('C90FA764-F303-43F6-AC24-2F9E9351C637', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'' ,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('16D438F4-72C7-4765-84DE-4C34867F7760', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'' ,2)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('51ED8EA2-133F-4277-90C5-6C1F6EB50F8B', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'ɾ' ,3)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('0BF51430-3A6D-483B-9516-89711266E2F5', 'EDC50857-7762-4498-83C6-5BDE85036BAB' ,'' ,4)
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('74A6B343-5837-416B-AE9C-D2BBCA08E41F' ,'Ϣ',null,'HSSE/Hazard/HazardInfo.aspx',25,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('D4A583C2-5505-4FBD-BE1C-1A168FA0F352', '74A6B343-5837-416B-AE9C-D2BBCA08E41F' ,'' ,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('693767D0-37E7-4FA1-8C21-C02C543AF811', '74A6B343-5837-416B-AE9C-D2BBCA08E41F' ,'' ,2)
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('F6A6D53A-150E-43DB-A3C4-6FA18E9401E9' ,'շּܿ',null,'HSSE/Hazard/RiskControl.aspx',30,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('7608EEE7-4102-449C-8F61-272E3952C8A8', 'F6A6D53A-150E-43DB-A3C4-6FA18E9401E9' ,'' ,1)
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('D256E5C8-DC76-4F4D-BABE-A253418823F4' ,'Ѳ¼',null,'HSSE/Hazard/RoutingInspection.aspx',32,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('1D00171C-17EB-46EB-8892-86FCC495CF9B', 'D256E5C8-DC76-4F4D-BABE-A253418823F4' ,'ɾ' ,1)
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('94C36333-C22A-499F-B9DB-53EEF77922AE' ,'ĿֳشHSEؿƴʩһ',null,'HSSE/Hazard/MajorHazardList.aspx',40,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
+INSERT INTO dbo.Sys_Menu (MenuId,MenuName,Icon,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('E22F555A-D41C-4F5F-9734-39B578957732' ,'ΣԴʶļ',null,'HSSE/Hazard/OtherHazard.aspx',50,'9A3212F8-2392-4F21-A8C7-FF5EE3B191F1', 'Menu_HSSE',0,1,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('EACFD7D1-93F9-4BD3-AB9B-E4BD4FA0147C', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'' ,1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('296031BC-B143-48F3-B903-B7697ED6B704', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'' ,2)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('B21B1B8A-E2F5-4A68-AC0A-9666B051BBE2', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'ɾ' ,3)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('AB49F853-52D5-4CFC-9CE0-BC3504C7D90A', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'' ,4)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('A83A0227-09D1-4D93-940C-E9BC6066EE6C', 'E22F555A-D41C-4F5F-9734-39B578957732' ,'ύ' ,5)
+GO
+
+
+
+drop table [dbo].[Hazard_HazardSelectedItem]
+GO
+
+
+CREATE TABLE [dbo].[Hazard_HazardSelectedItem](
+ [HazardSelectedItemId] [nvarchar](50) NOT NULL,
+ [HazardId] [nvarchar](50) NOT NULL,
+ [HazardListTypeId] [nvarchar](50) NULL,
+ [HazardListId] [nvarchar](50) NOT NULL,
+ [HazardItems] [nvarchar](100) NULL,
+ [DefectsType] [nvarchar](50) NULL,
+ [MayLeadAccidents] [nvarchar](100) NULL,
+ [HelperMethod] [nvarchar](50) NULL,
+ [HazardJudge_L] [numeric](6, 1) NULL,
+ [HazardJudge_E] [numeric](6, 1) NULL,
+ [HazardJudge_C] [numeric](6, 1) NULL,
+ [HazardJudge_D] [numeric](6, 1) NULL,
+ [HazardLevel] [nvarchar](50) NULL,
+ [ControlMeasures] [nvarchar](200) NULL,
+ [IsResponse] [bit] NULL,
+ [ResponseRecode] [nvarchar](100) NULL,
+ [PromptTime] [int] NULL,
+ [Remark] [nvarchar](100) NULL,
+ [WorkStage] [nvarchar](2000) NULL,
+ [ProjectId] [nvarchar](50) NULL,
+ [DutyPerson] [nvarchar](50) NULL,
+ [CheckStartDate] [datetime] NULL,
+ [IsStart] [bit] NULL,
+ [State] [char](1) NULL,
+ [PlanExistDate] [datetime] NULL,
+ [QRCodeAttachUrl] [nvarchar](200) NULL,
+ CONSTRAINT [PK_Hazard_HazardSelectedItem_1] PRIMARY KEY CLUSTERED
+(
+ [HazardSelectedItemId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ΣԴ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ΣԴ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardListTypeId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'嵥' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardListId'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Σϸ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardItems'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ȱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'DefectsType'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܵµ¹' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'MayLeadAccidents'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'(Ϊ:I,,,,)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HelperMethod'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵΣ(L)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_L'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵΣ(E)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_E'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵΣ(C)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_C'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҵΣ(D)' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardJudge_D'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Σռ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'HazardLevel'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ƴʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'ControlMeasures'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ǷӦ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'IsResponse'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ӧ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'ResponseRecode'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʾʱ䣨1-1ܣ2-2ܣԴƣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'PromptTime'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem', @level2type=N'COLUMN',@level2name=N'Remark'
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ΣʶΣ۽' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_HazardSelectedItem'
+GO
+
+
+
+CREATE TABLE [dbo].[Hazard_PatrolPlan](
+ [PatrolPlanId] [nvarchar](50) NOT NULL,
+ [HazardSelectedItemId] [nvarchar](50) NULL,
+ [HazardLevel] [nvarchar](50) NULL,
+ [DutyPerson] [nvarchar](50) NULL,
+ [Days] [int] NULL,
+ [CheckStartDate] [datetime] NULL,
+ [LimitCheckDate] [datetime] NULL,
+ [CheckDate] [datetime] NULL,
+ [State] [char](1) NULL,
+ CONSTRAINT [PK_Hazard_PatrolPlan] PRIMARY KEY CLUSTERED
+(
+ [PatrolPlanId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+SET ANSI_PADDING OFF
+GO
+
+ALTER TABLE [dbo].[Hazard_PatrolPlan] WITH CHECK ADD CONSTRAINT [FK_Hazard_PatrolPlan_Hazard_HazardSelectedItem] FOREIGN KEY([HazardSelectedItemId])
+REFERENCES [dbo].[Hazard_HazardSelectedItem] ([HazardSelectedItemId])
+GO
+
+ALTER TABLE [dbo].[Hazard_PatrolPlan] CHECK CONSTRAINT [FK_Hazard_PatrolPlan_Hazard_HazardSelectedItem]
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ѳƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_PatrolPlan'
+GO
+
+
+
+CREATE TABLE [dbo].[Hazard_RiskEvaluationRecord](
+ [LECItemRecordId] [nvarchar](50) NOT NULL,
+ [DataId] [nvarchar](50) NULL,
+ [DataType] [nvarchar](50) NULL,
+ [Evaluatorld] [nvarchar](50) NULL,
+ [EvaluatorDate] [date] NULL,
+ [L] [numeric](6, 1) NULL,
+ [E] [numeric](6, 1) NULL,
+ [C] [numeric](6, 1) NULL,
+ [D] [numeric](6, 1) NULL,
+ [RiskLevel] [nvarchar](50) NULL,
+ [ControlMeasures] [nvarchar](800) NULL,
+ [Remark] [nvarchar](500) NULL,
+ CONSTRAINT [PK_Hazard_RiskEvaluationRecord] PRIMARY KEY CLUSTERED
+(
+ [LECItemRecordId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+
+CREATE TABLE [dbo].[Hazard_RoutingInspection](
+ [RoutingInspectionId] [nvarchar](50) NOT NULL,
+ [HazardSelectedItemId] [nvarchar](50) NULL,
+ [PatrolManId] [nvarchar](50) NULL,
+ [PatrolTime] [datetime] NULL,
+ [PatrolResult] [int] NULL,
+ [OldRiskLevel] [nvarchar](50) NULL,
+ [PohotoUrl] [nvarchar](200) NULL,
+ [ControlMeasures] [nvarchar](200) NULL,
+ [DealReason] [nvarchar](200) NULL,
+ [RiskManId] [nvarchar](50) NULL,
+ [PatrolPlanId] [nvarchar](50) NULL,
+ CONSTRAINT [PK_Hazard_RoutingInspection] PRIMARY KEY CLUSTERED
+(
+ [RoutingInspectionId] ASC
+)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
+) ON [PRIMARY]
+
+GO
+
+EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ѳ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Hazard_RoutingInspection'
+GO
+
+
+ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+ VALUES('E4B526CC-805E-4131-8E18-2FFA6871507E','յȼ','BaseInfo/RiskLevel.aspx',140,'8A2CEE72-2793-49C6-9E2E-E83B2676E2DD','Menu_SysSet',1,1,1)
+ GO
+ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES('97A0EF27-78C7-4D6D-AE41-BCB28C3A0CA5','E4B526CC-805E-4131-8E18-2FFA6871507E','',1)
+ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES('2ACA14F6-93FD-458E-830F-BEBDC364829D','E4B526CC-805E-4131-8E18-2FFA6871507E','',2)
+ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES('2C201030-1DC1-4D0D-B97A-C85BBFAF7C22','E4B526CC-805E-4131-8E18-2FFA6871507E','ɾ',3)
+ INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+ VALUES('B36F59BD-1471-45EE-BF56-525673103B4B','E4B526CC-805E-4131-8E18-2FFA6871507E','',4)
+ GO
+
+ INSERT INTO dbo.Base_RiskLevel
+ VALUES('01537cc5-e8d2-497c-ba53-1faca1faf495',2,'/һ',121,170,'Σգص',7,'')
+ GO
+ INSERT INTO dbo.Base_RiskLevel
+ VALUES('6baaf2bb-ee7c-410c-9a32-13208626c467',3,'/ϴ',170,320,'߶Σգ',3,'')
+ GO
+ INSERT INTO dbo.Base_RiskLevel
+ VALUES('84e1d680-5bfe-48d2-a255-59f43aa3615a',1,'һ/ͷ',NULL,120,'һΣգҪ',21,'')
+ GO
+ INSERT INTO dbo.Base_RiskLevel
+ VALUES('c9e6285c-2da3-4997-8dc9-fb6ab404346e',4,'ļ/ش',321,NULL,'Σգҵ',1,'')
+ GO
+
+ update Comprehensive_InspectionPerson set IsTrain=1
+ GO
+ update Comprehensive_DesignDetails set JoinPersonNum=6
+ GO
+ update Comprehensive_InspectionMachine set IsCheckOK=1
+ GO
+
+ alter table [dbo].[Accident_AccidentReport] add AccidentDegree char(1) null
+ GO
+
+ alter table [dbo].[Hazard_HazardSelectedItem] add Position nvarchar(500) null
+ GO
+
+ INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed)
+VALUES('aa55fad1-6c51-43f5-8c99-3c6aaae79118','߱','CQMS/Comprehensive/InspectionMachine.aspx',30,'4a0e62cb-ee50-4a14-80b7-377602e9902c','Menu_CQMS',0,1,1)
+GO
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+VALUES('63b69c8f-93ac-494a-a02a-5417c99d067e','aa55fad1-6c51-43f5-8c99-3c6aaae79118','',1)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+VALUES('1a8efd13-f072-4cc4-8dca-7229752c63ae','aa55fad1-6c51-43f5-8c99-3c6aaae79118','',2)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+VALUES('de27884b-cccf-478d-8abd-045f19ef3e06','aa55fad1-6c51-43f5-8c99-3c6aaae79118','ɾ',3)
+INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex)
+VALUES('148c8ae4-b43e-4883-9222-a896fed0e52e','aa55fad1-6c51-43f5-8c99-3c6aaae79118','',4)
+GO
\ No newline at end of file
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 82c6ba45..e5199c29 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -55,8 +55,8 @@
False
..\FineUIPro\FineUIPro.dll
-
- ..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
+
+ ..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll
False
@@ -94,18 +94,24 @@
-
- ..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll
+
+ ..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll
..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll
-
- ..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll
+
+ ..\packages\System.Text.Encodings.Web.7.0.0\lib\netstandard2.0\System.Text.Encodings.Web.dll
+
+
+ ..\packages\System.Text.Json.7.0.2\lib\netstandard2.0\System.Text.Json.dll
+
..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll
@@ -199,6 +205,7 @@
+
@@ -481,6 +488,9 @@
+
+
+
diff --git a/SGGL/BLL/BaseInfo/CertificateService.cs b/SGGL/BLL/BaseInfo/CertificateService.cs
index f93fe050..b0b0c6c9 100644
--- a/SGGL/BLL/BaseInfo/CertificateService.cs
+++ b/SGGL/BLL/BaseInfo/CertificateService.cs
@@ -34,6 +34,8 @@ namespace BLL
CertificateId = certificate.CertificateId,
CertificateCode = certificate.CertificateCode,
CertificateName = certificate.CertificateName,
+ CertificateType = certificate.CertificateType,
+ IsRegisterHSSE = certificate.IsRegisterHSSE,
Remark = certificate.Remark
};
db.Base_Certificate.InsertOnSubmit(newCertificate);
@@ -52,6 +54,8 @@ namespace BLL
{
newCertificate.CertificateCode = certificate.CertificateCode;
newCertificate.CertificateName = certificate.CertificateName;
+ newCertificate.CertificateType = certificate.CertificateType;
+ newCertificate.IsRegisterHSSE = certificate.IsRegisterHSSE;
newCertificate.Remark = certificate.Remark;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/BaseInfo/RiskLevelService.cs b/SGGL/BLL/BaseInfo/RiskLevelService.cs
new file mode 100644
index 00000000..3e92769e
--- /dev/null
+++ b/SGGL/BLL/BaseInfo/RiskLevelService.cs
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace BLL
+{
+ ///
+ /// 许可证类型
+ ///
+ public static class RiskLevelService
+ {
+ public static Model.SGGLDB db = Funs.DB;
+
+ ///
+ /// 根据主键获取许可证类型
+ ///
+ ///
+ ///
+ public static Model.Base_RiskLevel GetRiskLevel(string riskLevelId)
+ {
+ return Funs.DB.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId == riskLevelId);
+ }
+
+ ///
+ /// 添加许可证类型
+ ///
+ ///
+ public static void AddRiskLevel(Model.Base_RiskLevel reskLevel)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Base_RiskLevel newreskLevel = new Model.Base_RiskLevel
+ {
+ RiskLevelId = reskLevel.RiskLevelId,
+ RiskLevel = reskLevel.RiskLevel,
+ RiskLevelName = reskLevel.RiskLevelName,
+ ControlMeasures = reskLevel.ControlMeasures,
+ Days = reskLevel.Days,
+ Remark = reskLevel.Remark,
+ MaxValue = reskLevel.MaxValue,
+ MinValue = reskLevel.MinValue
+ };
+ db.Base_RiskLevel.InsertOnSubmit(newreskLevel);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 修改许可证类型
+ ///
+ ///
+ public static void UpdateLicenseType(Model.Base_RiskLevel riskLevel)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Base_RiskLevel newRiskLevel = db.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId == riskLevel.RiskLevelId);
+ if (newRiskLevel != null)
+ {
+ newRiskLevel.RiskLevel = riskLevel.RiskLevel;
+ newRiskLevel.RiskLevelName = riskLevel.RiskLevelName;
+ newRiskLevel.MinValue = riskLevel.MinValue;
+ newRiskLevel.MaxValue = riskLevel.MaxValue;
+ newRiskLevel.ControlMeasures = riskLevel.ControlMeasures;
+ newRiskLevel.Days = riskLevel.Days;
+ newRiskLevel.Remark = riskLevel.Remark;
+ db.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据主键删除许可证类型
+ ///
+ ///
+ public static void DeleteRiskLevelById(string riskLevelId)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Base_RiskLevel riskLevel = db.Base_RiskLevel.FirstOrDefault(e => e.RiskLevelId== riskLevelId);
+ if (riskLevel != null)
+ {
+ db.Base_RiskLevel.DeleteOnSubmit(riskLevel);
+ db.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 获取许可证类型下拉选择项
+ ///
+ ///
+ public static List GetLicenseTypeList()
+ {
+ return (from x in Funs.DB.Base_RiskLevel orderby x.RiskLevel select x).ToList();
+ }
+
+ #region 许可证类型下拉框
+ ///
+ /// 许可证类型下拉框
+ ///
+ /// 下拉框名字
+ /// 是否显示请选择
+ public static void InitRiskLevelDropDownList(FineUIPro.DropDownList dropName, bool isShowPlease)
+ {
+ dropName.DataValueField = "RiskLevelId";
+ dropName.DataTextField = "RiskLevelName";
+ dropName.DataSource = GetLicenseTypeList();
+ dropName.DataBind();
+ if (isShowPlease)
+ {
+ Funs.FineUIPleaseSelect(dropName);
+ }
+ }
+ public static void InitRiskLevelDropDownListByRiskLevelName(FineUIPro.DropDownList dropName, bool isShowPlease)
+ {
+ dropName.DataValueField = "RiskLevelName";
+ dropName.DataTextField = "RiskLevelName";
+ dropName.DataSource = GetLicenseTypeList();
+ dropName.DataBind();
+ if (isShowPlease)
+ {
+ Funs.FineUIPleaseSelect(dropName);
+ }
+ }
+ #endregion
+ }
+}
diff --git a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs
index a2284474..9b7cfd42 100644
--- a/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/DesignDetailsService.cs
@@ -138,6 +138,7 @@ namespace BLL
newDesignDetails.AttachUrl = designDetails.AttachUrl;
newDesignDetails.CompileMan = designDetails.CompileMan;
newDesignDetails.CompileDate = designDetails.CompileDate;
+ newDesignDetails.JoinPersonNum = designDetails.JoinPersonNum;
newDesignDetails.Status = designDetails.Status;
db.Comprehensive_DesignDetails.InsertOnSubmit(newDesignDetails);
db.SubmitChanges();
@@ -161,6 +162,7 @@ namespace BLL
newDesignDetails.UnitWorkId = designDetails.UnitWorkId;
newDesignDetails.UnitName = designDetails.UnitName;
newDesignDetails.AttachUrl = designDetails.AttachUrl;
+ newDesignDetails.JoinPersonNum = designDetails.JoinPersonNum;
newDesignDetails.Status = designDetails.Status;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
index 2c42cf4b..06617013 100644
--- a/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionMachineService.cs
@@ -120,6 +120,7 @@ namespace BLL
newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
+ newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
newInspectionMachine.CompileMan = inspectionMachine.CompileMan;
newInspectionMachine.CompileDate = inspectionMachine.CompileDate;
@@ -152,6 +153,7 @@ namespace BLL
newInspectionMachine.NextTestDate = inspectionMachine.NextTestDate;
newInspectionMachine.TestCycle = inspectionMachine.TestCycle;
newInspectionMachine.IsVerification = inspectionMachine.IsVerification;
+ newInspectionMachine.IsCheckOK = inspectionMachine.IsCheckOK;
newInspectionMachine.InspectionDate = inspectionMachine.InspectionDate;
newInspectionMachine.AttachUrl = inspectionMachine.AttachUrl;
newInspectionMachine.CNProfessionalId = inspectionMachine.CNProfessionalId;
diff --git a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
index d629bfa4..f7d9918c 100644
--- a/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
+++ b/SGGL/BLL/CQMS/Comprehensive/InspectionPersonService.cs
@@ -59,6 +59,7 @@ namespace BLL
newInspectionPerson.CompileDate = inspectionPerson.CompileDate;
newInspectionPerson.IsOnSite = inspectionPerson.IsOnSite;
newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
+ newInspectionPerson.IsTrain= inspectionPerson.IsTrain;
newInspectionPerson.Status = inspectionPerson.Status;
db.Comprehensive_InspectionPerson.InsertOnSubmit(newInspectionPerson);
db.SubmitChanges();
@@ -89,6 +90,7 @@ namespace BLL
newInspectionPerson.CNProfessionalId = inspectionPerson.CNProfessionalId;
newInspectionPerson.IsOnSite = inspectionPerson.IsOnSite;
newInspectionPerson.UnitWorkId = inspectionPerson.UnitWorkId;
+ newInspectionPerson.IsTrain = inspectionPerson.IsTrain;
newInspectionPerson.Status = inspectionPerson.Status;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs
index 29253454..881910b2 100644
--- a/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs
+++ b/SGGL/BLL/CQMS/WBS/BreakdownProjectService.cs
@@ -260,6 +260,7 @@ namespace BLL
newBreakdownProject.YeZhu = breakdownProject.YeZhu;
newBreakdownProject.FenBao = breakdownProject.FenBao;
newBreakdownProject.SourceBreakdownId = breakdownProject.SourceBreakdownId;
+ newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType;
db.WBS_BreakdownProject.InsertOnSubmit(newBreakdownProject);
db.SubmitChanges();
@@ -288,6 +289,7 @@ namespace BLL
newBreakdownProject.JianLi = breakdownProject.JianLi;
newBreakdownProject.YeZhu = breakdownProject.YeZhu;
newBreakdownProject.FenBao = breakdownProject.FenBao;
+ newBreakdownProject.CheckAcceptType = breakdownProject.CheckAcceptType;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/CQMS/WBS/BreakdownService.cs b/SGGL/BLL/CQMS/WBS/BreakdownService.cs
index ec105292..f858d9cc 100644
--- a/SGGL/BLL/CQMS/WBS/BreakdownService.cs
+++ b/SGGL/BLL/CQMS/WBS/BreakdownService.cs
@@ -65,6 +65,7 @@ namespace BLL
x.WuHuan,
x.JianLi,
x.YeZhu,
+ x.CheckAcceptType,
CheckPointsDef = Funs.GetSubStr(x.CheckPoints, 15),
RecordAndCodeDef = Funs.GetSubStr(x.RecordAndCode, 15),
x.ModelURL
@@ -107,6 +108,7 @@ namespace BLL
newBreakdown.WuHuan = breakdown.WuHuan;
newBreakdown.JianLi = breakdown.JianLi;
newBreakdown.YeZhu = breakdown.YeZhu;
+ newBreakdown.CheckAcceptType = breakdown.CheckAcceptType;
db.WBS_Breakdown.InsertOnSubmit(newBreakdown);
db.SubmitChanges();
@@ -134,6 +136,7 @@ namespace BLL
newBreakdown.WuHuan = breakdown.WuHuan;
newBreakdown.JianLi = breakdown.JianLi;
newBreakdown.YeZhu = breakdown.YeZhu;
+ newBreakdown.CheckAcceptType = breakdown.CheckAcceptType;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
index fd9722da..bcbb8004 100644
--- a/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
+++ b/SGGL/BLL/CQMS/WBS/DivisionProjectService.cs
@@ -78,6 +78,7 @@ namespace BLL
newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId;
newDivisionProject.UnitWorkId = divisionProject.UnitWorkId;
newDivisionProject.OldDivisionId = divisionProject.OldDivisionId;
+ newDivisionProject.SubItemType = divisionProject.SubItemType;
db.WBS_DivisionProject.InsertOnSubmit(newDivisionProject);
db.SubmitChanges();
}
@@ -96,6 +97,7 @@ namespace BLL
newDivisionProject.SuperDivisionId = divisionProject.SuperDivisionId;
newDivisionProject.CNProfessionalId = divisionProject.CNProfessionalId;
newDivisionProject.IsSelected = divisionProject.IsSelected;
+ newDivisionProject.SubItemType = divisionProject.SubItemType;
db.SubmitChanges();
}
@@ -152,16 +154,6 @@ namespace BLL
return Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.DivisionProjectId == divisionProjectId);
}
- ///
- /// 根据主键返回一个分部/子分部信息
- ///
- /// 分部/子分部编号
- ///
- public static Model.WBS_DivisionProject GetDivisionProjectByUnitWorkIdAndOldDivisionId(string unitWorkId, string oldDivisionId)
- {
- return Funs.DB.WBS_DivisionProject.FirstOrDefault(x => x.UnitWorkId == unitWorkId && x.OldDivisionId == oldDivisionId);
- }
-
///
/// 判断分部/子分部编号是否存在
///
diff --git a/SGGL/BLL/CQMS/WBS/DivisionService.cs b/SGGL/BLL/CQMS/WBS/DivisionService.cs
index 81e4adee..1918d60e 100644
--- a/SGGL/BLL/CQMS/WBS/DivisionService.cs
+++ b/SGGL/BLL/CQMS/WBS/DivisionService.cs
@@ -75,6 +75,7 @@ namespace BLL
newDivision.SortIndex = division.SortIndex;
newDivision.SuperDivisionId = division.SuperDivisionId;
newDivision.CNProfessionalId = division.CNProfessionalId;
+ newDivision.SubItemType = division.SubItemType;
db.WBS_Division.InsertOnSubmit(newDivision);
db.SubmitChanges();
}
@@ -92,6 +93,7 @@ namespace BLL
newDivision.SortIndex = division.SortIndex;
newDivision.SuperDivisionId = division.SuperDivisionId;
newDivision.CNProfessionalId = division.CNProfessionalId;
+ newDivision.SubItemType = division.SubItemType;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs
index 0ccbb719..0191cc47 100644
--- a/SGGL/BLL/Common/Const.cs
+++ b/SGGL/BLL/Common/Const.cs
@@ -1591,6 +1591,10 @@ namespace BLL
/// 执业资格证书证书
///
public const string PracticeCertificateMenuId = "1390195D8-874B-4E7B-8DBF-D81A5984E973";
+ ///
+ /// 风险等级
+ ///
+ public const string RiskLevelMenuId = "E4B526CC-805E-4131-8E18-2FFA6871507E";
#endregion
#region 质量基础信息
@@ -2248,6 +2252,18 @@ namespace BLL
/// 危险源辨识与评价清单
///
public const string ProjectHazardListMenuId = "EDC50857-7762-4498-83C6-5BDE85036BAB";
+ ///
+ /// 风险信息库
+ ///
+ public const string ProjectHazardInfoMenuId = "74A6B343-5837-416B-AE9C-D2BBCA08E41F";
+ ///
+ /// 风险分级管控
+ ///
+ public const string ProjectRiskControlMenuId = "F6A6D53A-150E-43DB-A3C4-6FA18E9401E9";
+ ///
+ /// 风险巡检记录
+ ///
+ public const string ProjectRoutingInspectionMenuId = "D256E5C8-DC76-4F4D-BABE-A253418823F4";
///
/// 风险提示
diff --git a/SGGL/BLL/Common/IDCardValid.cs b/SGGL/BLL/Common/IDCardValid.cs
index 65b4f42b..b6999f34 100644
--- a/SGGL/BLL/Common/IDCardValid.cs
+++ b/SGGL/BLL/Common/IDCardValid.cs
@@ -103,5 +103,50 @@ namespace BLL
return true;//符合15位身份证标准
}
#endregion
+
+ ///
+ /// 根据身份证号码获取生日
+ ///
+ ///
+ ///
+ public static DateTime? getBirthByIDCard(string IDCard)
+ {
+ DateTime? birth = null;
+ if (!string.IsNullOrEmpty(IDCard))
+ {
+ string birthStr = string.Empty;
+ if (IDCard.Length == 18)
+ {
+ birthStr = IDCard.Substring(6, 8).Insert(6, "-").Insert(4, "-");
+
+ }
+ else if (IDCard.Length == 15)
+ {
+ birthStr = IDCard.Substring(6, 6).Insert(4, "-").Insert(2, "-");
+ }
+
+ DateTime time = new DateTime();
+ if (DateTime.TryParse(birthStr, out time))
+ {
+ birth = time;
+ }
+ }
+
+ return birth;
+ }
+
+ ///
+ /// 获取年龄
+ ///
+ ///
+ ///
+ ///
+ public static int CalculateAgeCorrect(DateTime birthDate)
+ {
+ DateTime now = DateTime.Now;
+ int age = now.Year - birthDate.Year;
+ if (now.Month < birthDate.Month || (now.Month == birthDate.Month && now.Day < birthDate.Day)) age--;
+ return age;
+ }
}
}
\ No newline at end of file
diff --git a/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs b/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs
index 2c886ce1..df9c7386 100644
--- a/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs
+++ b/SGGL/BLL/HSSE/Accident/AccidentPersonRecordService.cs
@@ -46,7 +46,8 @@ namespace BLL
FileContent = accidentPersonRecord.FileContent,
CompileMan = accidentPersonRecord.CompileMan,
CompileDate = accidentPersonRecord.CompileDate,
- States = accidentPersonRecord.States
+ States = accidentPersonRecord.States,
+ IsAttempt= accidentPersonRecord.IsAttempt,
};
db.Accident_AccidentPersonRecord.InsertOnSubmit(newAccidentPersonRecord);
db.SubmitChanges();
@@ -77,6 +78,7 @@ namespace BLL
newAccidentPersonRecord.CompileMan = accidentPersonRecord.CompileMan;
newAccidentPersonRecord.CompileDate = accidentPersonRecord.CompileDate;
newAccidentPersonRecord.States = accidentPersonRecord.States;
+ newAccidentPersonRecord.IsAttempt= accidentPersonRecord.IsAttempt;
db.SubmitChanges();
}
}
diff --git a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs
index 1a51ae68..bdabca29 100644
--- a/SGGL/BLL/HSSE/Accident/AccidentReportService.cs
+++ b/SGGL/BLL/HSSE/Accident/AccidentReportService.cs
@@ -387,6 +387,7 @@ namespace BLL
NotConfirmWorkingHoursLoss = accidentReport.NotConfirmWorkingHoursLoss,
NotConfirmEconomicLoss = accidentReport.NotConfirmEconomicLoss,
NotConfirmEconomicOtherLoss = accidentReport.NotConfirmEconomicOtherLoss,
+ AccidentDegree = accidentReport.AccidentDegree,
NotConfirmed = accidentReport.NotConfirmed
};
db.Accident_AccidentReport.InsertOnSubmit(newAccidentReport);
@@ -430,6 +431,7 @@ namespace BLL
newAccidentReport.IsNotConfirm = accidentReport.IsNotConfirm;
newAccidentReport.NotConfirmWorkingHoursLoss = accidentReport.NotConfirmWorkingHoursLoss;
newAccidentReport.NotConfirmEconomicLoss = accidentReport.NotConfirmEconomicLoss;
+ newAccidentReport.AccidentDegree = accidentReport.AccidentDegree;
newAccidentReport.NotConfirmEconomicOtherLoss = accidentReport.NotConfirmEconomicOtherLoss;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs
index 081d2616..fb5208da 100644
--- a/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs
+++ b/SGGL/BLL/HSSE/Hazard/Hazard_HazardSelectedItemService.cs
@@ -39,6 +39,7 @@ namespace BLL
x.PromptTime,
x.Remark,
x.WorkStage,
+ x.Position,
//HazardLevelName = (from y in db.Hazard_HazardLevel where y.HazardLevelId == x.HazardLevel select y.HazardLevelName).First(),
};
}
@@ -72,6 +73,7 @@ namespace BLL
x.PromptTime,
x.Remark,
x.WorkStage,
+ x.Position,
//HazardLevelName = (from y in db.Hazard_HazardLevel where y.HazardLevelId == x.HazardLevel select y.HazardLevelName).First(),
};
}
@@ -104,6 +106,16 @@ namespace BLL
return db.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardId == hazardId && x.HazardListId == hazardListId && x.WorkStage == workStage);
}
+ ///
+ /// 根据危险源辨识与评价清单Id获取一个危险源辨识与评价清单审批信息
+ ///
+ /// 危险源辨识与评价清单Id
+ /// 一个危险源辨识与评价清单审批实体
+ public static Model.Hazard_HazardSelectedItem GetHazardSelectedItemByHazardSelectedItemId(string hazardSelectedItemId)
+ {
+ return db.Hazard_HazardSelectedItem.FirstOrDefault(x => x.HazardSelectedItemId == hazardSelectedItemId);
+ }
+
///
/// 根据危险源辨识与评价清单Id获取一个危险源辨识与评价清单审批信息
///
@@ -156,11 +168,13 @@ namespace BLL
Model.SGGLDB db = Funs.DB;
Model.Hazard_HazardSelectedItem newHazardSelectedItem = new Model.Hazard_HazardSelectedItem
{
+ HazardSelectedItemId = hazardSelectedItem.HazardSelectedItemId,
HazardId = hazardSelectedItem.HazardId,
HazardListTypeId = hazardSelectedItem.HazardListTypeId,
HazardListId = hazardSelectedItem.HazardListId,
HazardItems = hazardSelectedItem.HazardItems,
DefectsType = hazardSelectedItem.DefectsType,
+ ProjectId = hazardSelectedItem.ProjectId,
MayLeadAccidents = hazardSelectedItem.MayLeadAccidents,
HelperMethod = hazardSelectedItem.HelperMethod,
HazardJudge_L = hazardSelectedItem.HazardJudge_L,
@@ -171,9 +185,12 @@ namespace BLL
ControlMeasures = hazardSelectedItem.ControlMeasures,
IsResponse = hazardSelectedItem.IsResponse,
ResponseRecode = hazardSelectedItem.ResponseRecode,
+ DutyPerson = hazardSelectedItem.DutyPerson,
PromptTime = hazardSelectedItem.PromptTime,
Remark = hazardSelectedItem.Remark,
- WorkStage = hazardSelectedItem.WorkStage
+ State = hazardSelectedItem.State,
+ WorkStage = hazardSelectedItem.WorkStage,
+ Position = hazardSelectedItem.Position,
};
Funs.DB.Hazard_HazardSelectedItem.InsertOnSubmit(newHazardSelectedItem);
@@ -187,7 +204,7 @@ namespace BLL
public static void UpdateHazardSelectedItem(Model.Hazard_HazardSelectedItem hazardSelectedItem)
{
Model.SGGLDB db = Funs.DB;
- Model.Hazard_HazardSelectedItem newHazardSelectedItem = db.Hazard_HazardSelectedItem.FirstOrDefault(e => e.HazardId == hazardSelectedItem.HazardId && e.HazardListId == hazardSelectedItem.HazardListId && e.WorkStage == hazardSelectedItem.WorkStage);
+ Model.Hazard_HazardSelectedItem newHazardSelectedItem = db.Hazard_HazardSelectedItem.FirstOrDefault(e => e.HazardSelectedItemId == hazardSelectedItem.HazardSelectedItemId);
if (newHazardSelectedItem != null)
{
newHazardSelectedItem.HazardListTypeId = hazardSelectedItem.HazardListTypeId;
@@ -204,9 +221,16 @@ namespace BLL
newHazardSelectedItem.ControlMeasures = hazardSelectedItem.ControlMeasures;
newHazardSelectedItem.IsResponse = hazardSelectedItem.IsResponse;
newHazardSelectedItem.ResponseRecode = hazardSelectedItem.ResponseRecode;
+ newHazardSelectedItem.DutyPerson = hazardSelectedItem.DutyPerson;
newHazardSelectedItem.PromptTime = hazardSelectedItem.PromptTime;
newHazardSelectedItem.Remark = hazardSelectedItem.Remark;
newHazardSelectedItem.WorkStage = hazardSelectedItem.WorkStage;
+ newHazardSelectedItem.CheckStartDate = hazardSelectedItem.CheckStartDate;
+ newHazardSelectedItem.IsStart = hazardSelectedItem.IsStart;
+ newHazardSelectedItem.State = hazardSelectedItem.State;
+ newHazardSelectedItem.PlanExistDate = hazardSelectedItem.PlanExistDate;
+ newHazardSelectedItem.QRCodeAttachUrl = hazardSelectedItem.QRCodeAttachUrl;
+ newHazardSelectedItem.Position = hazardSelectedItem.Position;
db.SubmitChanges();
}
@@ -222,8 +246,30 @@ namespace BLL
var q = (from x in db.Hazard_HazardSelectedItem where x.HazardListId == hazardListId select x).ToList();
if (q.Count() > 0)
{
+ foreach (var item in q)
+ {
+ var h = db.Hazard_RiskEvaluationRecord.Where(x => x.DataId == item.HazardSelectedItemId);
+ if (h.Count() > 0)
+ {
+ db.Hazard_RiskEvaluationRecord.DeleteAllOnSubmit(h);
+ db.SubmitChanges();
+ }
+ var p = db.Hazard_PatrolPlan.Where(x => x.HazardSelectedItemId == item.HazardSelectedItemId);
+ if (p.Count() > 0)
+ {
+ db.Hazard_PatrolPlan.DeleteAllOnSubmit(p);
+ db.SubmitChanges();
+ }
+ var r = db.Hazard_RoutingInspection.Where(x => x.HazardSelectedItemId == item.HazardSelectedItemId);
+ if (r.Count() > 0)
+ {
+ db.Hazard_RoutingInspection.DeleteAllOnSubmit(r);
+ db.SubmitChanges();
+ }
+ }
db.Hazard_HazardSelectedItem.DeleteAllOnSubmit(q);
db.SubmitChanges();
+
}
}
}
diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_PatrolPlanService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_PatrolPlanService.cs
new file mode 100644
index 00000000..559f3318
--- /dev/null
+++ b/SGGL/BLL/HSSE/Hazard/Hazard_PatrolPlanService.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// 巡检计划表
+ ///
+ public static class Hazard_PatrolPlanService
+ {
+ ///
+ /// 根据巡检计划ID获取巡检计划信息
+ ///
+ ///
+ ///
+ public static Model.Hazard_PatrolPlan GetPatrolPlanByPatrolPlanId(string PatrolPlanId)
+ {
+ return Funs.DB.Hazard_PatrolPlan.FirstOrDefault(e => e.PatrolPlanId == PatrolPlanId);
+ }
+
+ ///
+ /// 根据风险ID和巡检时限获取巡检计划信息
+ ///
+ ///
+ ///
+ public static Model.Hazard_PatrolPlan GetPatrolPlanByHazardSelectedItemIdAndLimitCheckDate(string hazardSelectedItemId, DateTime? limitCheckDate)
+ {
+ return Funs.DB.Hazard_PatrolPlan.FirstOrDefault(e => e.HazardSelectedItemId == hazardSelectedItemId && e.LimitCheckDate == limitCheckDate);
+ }
+
+ ///
+ /// 根据巡检日期获取之前未巡检计划信息集合
+ ///
+ ///
+ ///
+ public static List GetBeforePatrolPlansByCheckDate(string hazardSelectedItemId, DateTime checkDate)
+ {
+ return (from x in Funs.DB.Hazard_PatrolPlan where x.HazardSelectedItemId == hazardSelectedItemId && x.LimitCheckDate < checkDate select x).ToList();
+ }
+
+ ///
+ /// 添加安全巡检计划
+ ///
+ ///
+ public static void AddPatrolPlan(Model.Hazard_PatrolPlan patrolPlan)
+ {
+ Model.Hazard_PatrolPlan newPatrolPlan = new Model.Hazard_PatrolPlan
+ {
+ PatrolPlanId = patrolPlan.PatrolPlanId,
+ HazardSelectedItemId = patrolPlan.HazardSelectedItemId,
+ HazardLevel = patrolPlan.HazardLevel,
+ DutyPerson = patrolPlan.DutyPerson,
+ Days = patrolPlan.Days,
+ CheckStartDate = patrolPlan.CheckStartDate,
+ LimitCheckDate = patrolPlan.LimitCheckDate,
+ CheckDate = patrolPlan.CheckDate,
+ State = patrolPlan.State
+ };
+
+ Funs.DB.Hazard_PatrolPlan.InsertOnSubmit(newPatrolPlan);
+ Funs.DB.SubmitChanges();
+ }
+
+ ///
+ /// 修改安全巡检计划
+ ///
+ ///
+ public static void UpdatePatrolPlan(Model.Hazard_PatrolPlan patrolPlan)
+ {
+ Model.Hazard_PatrolPlan newPatrolPlan = Funs.DB.Hazard_PatrolPlan.FirstOrDefault(e => e.PatrolPlanId == patrolPlan.PatrolPlanId);
+ if (newPatrolPlan != null)
+ {
+ newPatrolPlan.CheckDate = patrolPlan.CheckDate;
+ newPatrolPlan.State = patrolPlan.State;
+ Funs.DB.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据巡检计划ID删除对应巡检计划记录信息
+ ///
+ ///
+ public static void DeletePatrolPlan(string PatrolPlanId)
+ {
+ var q = (from x in Funs.DB.Hazard_PatrolPlan where x.PatrolPlanId == PatrolPlanId select x).FirstOrDefault();
+ if (q != null)
+ {
+ Funs.DB.Hazard_PatrolPlan.DeleteOnSubmit(q);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/HSSE/Hazard/Hazard_RoutingInspectionService.cs b/SGGL/BLL/HSSE/Hazard/Hazard_RoutingInspectionService.cs
new file mode 100644
index 00000000..0c48497c
--- /dev/null
+++ b/SGGL/BLL/HSSE/Hazard/Hazard_RoutingInspectionService.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ ///
+ /// 巡检记录表
+ ///
+ public static class Hazard_RoutingInspectionService
+ {
+ ///
+ /// 根据巡检记录ID获取巡检记录信息
+ ///
+ ///
+ ///
+ public static Model.Hazard_RoutingInspection GetRoutingInspectionByRoutingInspectionId(string RoutingInspectionId)
+ {
+ return Funs.DB.Hazard_RoutingInspection.FirstOrDefault(e => e.RoutingInspectionId == RoutingInspectionId);
+ }
+
+ ///
+ /// 根据巡检计划ID获取巡检记录信息
+ ///
+ ///
+ ///
+ public static Model.Hazard_RoutingInspection GetRoutingInspectionByPatrolPlanId(string PatrolPlanId)
+ {
+ return Funs.DB.Hazard_RoutingInspection.FirstOrDefault(e => e.PatrolPlanId == PatrolPlanId);
+ }
+
+ ///
+ /// 添加安全巡检记录
+ ///
+ ///
+ public static void AddRoutingInspection(Model.Hazard_RoutingInspection RoutingInspection)
+ {
+ Model.Hazard_RoutingInspection newRoutingInspection = new Model.Hazard_RoutingInspection
+ {
+ RoutingInspectionId = RoutingInspection.RoutingInspectionId,
+ HazardSelectedItemId = RoutingInspection.HazardSelectedItemId,
+ PatrolManId = RoutingInspection.PatrolManId,
+ PatrolTime = RoutingInspection.PatrolTime,
+ PatrolResult = RoutingInspection.PatrolResult,
+ OldRiskLevel = RoutingInspection.OldRiskLevel,
+ PohotoUrl = RoutingInspection.PohotoUrl,
+ ControlMeasures = RoutingInspection.ControlMeasures,
+ DealReason = RoutingInspection.DealReason,
+ RiskManId = RoutingInspection.RiskManId,
+ PatrolPlanId = RoutingInspection.PatrolPlanId
+ };
+
+ Funs.DB.Hazard_RoutingInspection.InsertOnSubmit(newRoutingInspection);
+ Funs.DB.SubmitChanges();
+ }
+
+ ///
+ /// 修改安全巡检记录
+ ///
+ ///
+ public static void UpdateRoutingInspection(Model.Hazard_RoutingInspection RoutingInspection)
+ {
+ Model.Hazard_RoutingInspection newRoutingInspection = Funs.DB.Hazard_RoutingInspection.FirstOrDefault(e => e.RoutingInspectionId == RoutingInspection.RoutingInspectionId);
+ if (newRoutingInspection != null)
+ {
+ newRoutingInspection.PatrolManId = RoutingInspection.PatrolManId;
+ newRoutingInspection.PatrolTime = RoutingInspection.PatrolTime;
+ newRoutingInspection.PatrolResult = RoutingInspection.PatrolResult;
+ newRoutingInspection.OldRiskLevel = RoutingInspection.OldRiskLevel;
+ newRoutingInspection.PohotoUrl = RoutingInspection.PohotoUrl;
+ newRoutingInspection.ControlMeasures = RoutingInspection.ControlMeasures;
+ newRoutingInspection.DealReason = RoutingInspection.DealReason;
+ Funs.DB.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据巡检记录ID删除对应巡检记录记录信息
+ ///
+ ///
+ public static void DeleteRoutingInspection(string RoutingInspectionId)
+ {
+ var q = (from x in Funs.DB.Hazard_RoutingInspection where x.RoutingInspectionId == RoutingInspectionId select x).FirstOrDefault();
+ if (q != null)
+ {
+ ///删除附件
+ BLL.CommonService.DeleteAttachFileById(RoutingInspectionId);
+ Funs.DB.Hazard_RoutingInspection.DeleteOnSubmit(q);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs b/SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs
new file mode 100644
index 00000000..afd3ec62
--- /dev/null
+++ b/SGGL/BLL/HSSE/Hazard/RiskEvaluationRecordService.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BLL
+{
+ public static class RiskEvaluationRecordService
+ {
+ public static Model.SGGLDB db = Funs.DB;
+
+ ///
+ /// 根据主键获取风险评价记录
+ ///
+ ///
+ ///
+ public static Model.Hazard_RiskEvaluationRecord GetRiskEvaluationRecordByLECItemRecordId(string LECItemRecordId)
+ {
+ return Funs.DB.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == LECItemRecordId);
+ }
+
+ ///
+ /// 根据风险主键获取风险评价记录
+ ///
+ ///
+ ///
+ public static Model.Hazard_RiskEvaluationRecord GetRiskEvaluationRecordByDataIdAndEvaluatorDate(string dataId)
+ {
+ return Funs.DB.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.DataId == dataId && e.EvaluatorDate == null);
+ }
+
+ ///
+ /// 根据整理人获取风险评价记录
+ ///
+ ///
+ ///
+ public static List GetRiskEvaluationRecordByDataId(string dataId)
+ {
+ return (from x in Funs.DB.Hazard_RiskEvaluationRecord where x.DataId == dataId select x).ToList();
+ }
+
+ ///
+ /// 添加风险评价记录
+ ///
+ ///
+ public static void AddRiskEvaluationRecord(Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Hazard_RiskEvaluationRecord newRiskEvaluationRecord = new Model.Hazard_RiskEvaluationRecord
+ {
+ LECItemRecordId = RiskEvaluationRecord.LECItemRecordId,
+ DataId = RiskEvaluationRecord.DataId,
+ DataType = RiskEvaluationRecord.DataType,
+ Evaluatorld = RiskEvaluationRecord.Evaluatorld,
+ EvaluatorDate = RiskEvaluationRecord.EvaluatorDate,
+ L = RiskEvaluationRecord.L,
+ E = RiskEvaluationRecord.E,
+ C = RiskEvaluationRecord.C,
+ D = RiskEvaluationRecord.D,
+ RiskLevel = RiskEvaluationRecord.RiskLevel,
+ ControlMeasures = RiskEvaluationRecord.ControlMeasures,
+ Remark = RiskEvaluationRecord.Remark,
+ };
+ db.Hazard_RiskEvaluationRecord.InsertOnSubmit(newRiskEvaluationRecord);
+ db.SubmitChanges();
+ }
+
+ ///
+ /// 修改风险评价记录
+ ///
+ ///
+ public static void UpdateRiskEvaluationRecord(Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Hazard_RiskEvaluationRecord newRiskEvaluationRecord = db.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == RiskEvaluationRecord.LECItemRecordId);
+ if (newRiskEvaluationRecord != null)
+ {
+ newRiskEvaluationRecord.DataId = RiskEvaluationRecord.DataId;
+ newRiskEvaluationRecord.DataType = RiskEvaluationRecord.DataType;
+ newRiskEvaluationRecord.Evaluatorld = RiskEvaluationRecord.Evaluatorld;
+ newRiskEvaluationRecord.EvaluatorDate = RiskEvaluationRecord.EvaluatorDate;
+ newRiskEvaluationRecord.L = RiskEvaluationRecord.L;
+ newRiskEvaluationRecord.E = RiskEvaluationRecord.E;
+ newRiskEvaluationRecord.C = RiskEvaluationRecord.C;
+ newRiskEvaluationRecord.D = RiskEvaluationRecord.D;
+ newRiskEvaluationRecord.RiskLevel = RiskEvaluationRecord.RiskLevel;
+ newRiskEvaluationRecord.ControlMeasures = RiskEvaluationRecord.ControlMeasures;
+ newRiskEvaluationRecord.Remark = RiskEvaluationRecord.Remark;
+ db.SubmitChanges();
+ }
+ }
+
+ ///
+ /// 根据主键删除风险评价记录
+ ///
+ ///
+ public static void DeleteRiskEvaluationRecordByLECItemRecordId(string LECItemRecordId)
+ {
+ Model.SGGLDB db = Funs.DB;
+ Model.Hazard_RiskEvaluationRecord RiskEvaluationRecord = db.Hazard_RiskEvaluationRecord.FirstOrDefault(e => e.LECItemRecordId == LECItemRecordId);
+ if (RiskEvaluationRecord != null)
+ {
+ db.Hazard_RiskEvaluationRecord.DeleteOnSubmit(RiskEvaluationRecord);
+ db.SubmitChanges();
+ }
+ }
+ }
+}
diff --git a/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs
index 6bf4ee8d..b1e164b9 100644
--- a/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs
+++ b/SGGL/BLL/HSSE/InApproveManager/EquipmentInItemService.cs
@@ -52,7 +52,8 @@ namespace BLL
RegistrationNum = equipmentInItem.RegistrationNum,
OperationQualificationNum = equipmentInItem.OperationQualificationNum,
InsuranceNum = equipmentInItem.InsuranceNum,
- CommercialInsuranceNum = equipmentInItem.CommercialInsuranceNum
+ CommercialInsuranceNum = equipmentInItem.CommercialInsuranceNum,
+ IsUsed = equipmentInItem.IsUsed,
};
db.InApproveManager_EquipmentInItem.InsertOnSubmit(newEquipmentItem);
db.SubmitChanges();
@@ -79,6 +80,7 @@ namespace BLL
newEquipmentItem.OperationQualificationNum = equipmentInItem.OperationQualificationNum;
newEquipmentItem.InsuranceNum = equipmentInItem.InsuranceNum;
newEquipmentItem.CommercialInsuranceNum = equipmentInItem.CommercialInsuranceNum;
+ newEquipmentItem.IsUsed = equipmentInItem.IsUsed;
db.SubmitChanges();
}
}
diff --git a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs
index 49209006..6a8f7aca 100644
--- a/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs
+++ b/SGGL/BLL/HSSE/InApproveManager/GeneralEquipmentInItemService.cs
@@ -44,7 +44,8 @@ namespace BLL
SpecialEquipmentId = generalEquipmentInItem.SpecialEquipmentId,
SizeModel = generalEquipmentInItem.SizeModel,
OwnerCheck = generalEquipmentInItem.OwnerCheck,
- CertificateNum = generalEquipmentInItem.CertificateNum
+ CertificateNum = generalEquipmentInItem.CertificateNum,
+ IsUsed = generalEquipmentInItem.IsUsed,
};
db.InApproveManager_GeneralEquipmentInItem.InsertOnSubmit(newEquipmentItem);
db.SubmitChanges();
@@ -65,6 +66,7 @@ namespace BLL
newGeneralEquipmentInItem.SizeModel = generalEquipmentInItem.SizeModel;
newGeneralEquipmentInItem.OwnerCheck = generalEquipmentInItem.OwnerCheck;
newGeneralEquipmentInItem.CertificateNum = generalEquipmentInItem.CertificateNum;
+ newGeneralEquipmentInItem.IsUsed = generalEquipmentInItem.IsUsed;
db.SubmitChanges();
}
}
diff --git a/SGGL/BLL/HSSE/License/LicenseManagerService.cs b/SGGL/BLL/HSSE/License/LicenseManagerService.cs
index acad5348..468ed11b 100644
--- a/SGGL/BLL/HSSE/License/LicenseManagerService.cs
+++ b/SGGL/BLL/HSSE/License/LicenseManagerService.cs
@@ -57,7 +57,8 @@ namespace BLL
WorkAreaId = licenseManager.WorkAreaId,
StartDate = licenseManager.StartDate,
EndDate = licenseManager.EndDate,
- WorkStates=licenseManager.WorkStates,
+ WorkStates = licenseManager.WorkStates,
+ IsHighRisk = licenseManager.IsHighRisk,
};
db.License_LicenseManager.InsertOnSubmit(newLicenseManager);
db.SubmitChanges();
@@ -88,6 +89,7 @@ namespace BLL
newLicenseManager.StartDate = licenseManager.StartDate;
newLicenseManager.EndDate = licenseManager.EndDate;
newLicenseManager.WorkStates = licenseManager.WorkStates;
+ newLicenseManager.IsHighRisk = licenseManager.IsHighRisk;
db.SubmitChanges();
}
}
@@ -100,7 +102,7 @@ namespace BLL
{
Model.SGGLDB db = Funs.DB;
Model.License_LicenseManager licenseManager = db.License_LicenseManager.FirstOrDefault(e => e.LicenseManagerId == licenseManagerId);
- if (licenseManager!=null)
+ if (licenseManager != null)
{
///删除编码表记录
BLL.CodeRecordsService.DeleteCodeRecordsByDataId(licenseManagerId);
@@ -110,7 +112,7 @@ namespace BLL
if (flowOperate.Count() > 0)
{
BLL.CommonService.DeleteFlowOperateByID(licenseManager.LicenseManagerId); ////删除审核流程表
- }
+ }
db.License_LicenseManager.DeleteOnSubmit(licenseManager);
db.SubmitChanges();
}
diff --git a/SGGL/BLL/HSSE/SitePerson/PersonService.cs b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
index be7036ed..a3d87601 100644
--- a/SGGL/BLL/HSSE/SitePerson/PersonService.cs
+++ b/SGGL/BLL/HSSE/SitePerson/PersonService.cs
@@ -14,6 +14,93 @@ namespace BLL
{
public static Model.SGGLDB db = Funs.DB;
+ #region 劳务人员列表
+ ///
+ /// 记录数
+ ///
+ public static int count2
+ {
+ get;
+ set;
+ }
+
+ ///
+ /// 定义变量
+ ///
+ private static IQueryable getDataLists = from x in db.View_SitePerson_Person
+ select x;
+
+ ///
+ /// 数据列表
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static IEnumerable getListData(string projetcId, string unitId, string workPostId, string name, string idCard, string states, Grid Grid1)
+ {
+ IQueryable getDataList = getDataLists.OrderBy(x => x.ProjectId).ThenBy(x => x.UnitId);
+ if (!string.IsNullOrEmpty(projetcId) && projetcId != Const._Null)
+ {
+ getDataList = getDataList.Where(e => e.ProjectId == projetcId);
+ }
+ if (!string.IsNullOrEmpty(unitId) && unitId != Const._Null)
+ {
+ getDataList = getDataList.Where(e => e.UnitId == unitId);
+ }
+ if (!string.IsNullOrEmpty(workPostId) && workPostId != Const._Null)
+ {
+ getDataList = getDataList.Where(e => e.WorkPostId == workPostId);
+ }
+ if (!string.IsNullOrEmpty(states) && states != "-2")
+ {
+ getDataList = getDataList.Where(e => e.IsUsed == Convert.ToInt32(states));
+ }
+ if (!string.IsNullOrEmpty(name))
+ {
+ getDataList = getDataList.Where(e => e.PersonName.Contains(name));
+ }
+ if (!string.IsNullOrEmpty(idCard))
+ {
+ getDataList = getDataList.Where(e => e.IdentityCard.Contains(idCard));
+ }
+ count2 = getDataList.Count();
+ if (count2 == 0)
+ {
+ return null;
+ }
+ getDataList = SortConditionHelper.SortingAndPaging(getDataList, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize);
+ return from x in getDataList
+ select new
+ {
+ x.PersonId,
+ x.PersonName,
+ x.CardNo,
+ x.IdentityCard,
+ x.Sex,
+ x.SexName,
+ x.UnitId,
+ x.UnitName,
+ x.WorkPostId,
+ x.WorkPostName,
+ x.ProjectId,
+ ProjectName = db.Base_Project.First(u => u.ProjectId == x.ProjectId).ProjectName,
+ ShortName = db.Base_Project.First(u => u.ProjectId == x.ProjectId).ShortName,
+ NativePlace = x.CountryName ?? "" + x.ProvinceName ?? "",
+ x.TeamGroupId,
+ x.TeamGroupName,
+ x.InTime,
+ x.OutTime,
+ x.IsUsed,
+ OutName = (x.IsUsed == 1 ? "是" : "否"),
+ };
+ }
+ #endregion
+
///
/// 根据主键获取人员信息
///
@@ -278,6 +365,7 @@ namespace BLL
Nation = person.Nation,
CountryCode = person.CountryCode,
ProvinceCode = person.ProvinceCode,
+ IsSafetyMonitoring = person.IsSafetyMonitoring,
IsCardNoOK = IDCardValid.CheckIDCard(person.IdentityCard),
};
@@ -332,6 +420,7 @@ namespace BLL
newPerson.PositionId = person.PositionId;
newPerson.PostTitleId = person.PostTitleId;
newPerson.PhotoUrl = person.PhotoUrl;
+ newPerson.IsSafetyMonitoring = person.IsSafetyMonitoring;
newPerson.HeadImage = person.HeadImage;
newPerson.IsUsed = person.IsUsed;
newPerson.IsCardUsed = person.IsCardUsed;
diff --git a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs
index c52a2501..e4dee6e3 100644
--- a/SGGL/BLL/HSSE/Solution/LargerHazardService.cs
+++ b/SGGL/BLL/HSSE/Solution/LargerHazardService.cs
@@ -41,6 +41,8 @@ namespace BLL
RecardMan = largerHazard.RecardMan,
Remark = largerHazard.Remark,
States = largerHazard.States,
+ TrainPersonNum = largerHazard.TrainPersonNum,
+ IsSuperLargerHazard = largerHazard.IsSuperLargerHazard,
Descriptions = largerHazard.Descriptions
};
@@ -68,6 +70,8 @@ namespace BLL
newLargerHazard.IsArgument = largerHazard.IsArgument;
newLargerHazard.Remark = largerHazard.Remark;
newLargerHazard.States = largerHazard.States;
+ newLargerHazard.TrainPersonNum = largerHazard.TrainPersonNum;
+ newLargerHazard.IsSuperLargerHazard = largerHazard.IsSuperLargerHazard;
newLargerHazard.Descriptions = largerHazard.Descriptions;
db.SubmitChanges();
}
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index 7f8d3fb1..37eaa7de 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -279,7 +279,7 @@ namespace BLL
var q = (from x in db.Base_Unit
join y in db.Project_ProjectUnit
on x.UnitId equals y.UnitId
- where y.ProjectId == projectId && y.UnitType == unitType
+ where y.ProjectId == projectId && (y.UnitType == unitType || string.IsNullOrEmpty(unitType))
orderby x.UnitCode
select x).ToList();
return q;
diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx
index eb9b7276..7d3ef9ba 100644
--- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx
+++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx
@@ -8,9 +8,9 @@
diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
index f7b52336..d5751878 100644
--- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
+++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.cs
@@ -23,6 +23,7 @@ namespace FineUIPro.Web.BaseInfo
////权限按钮方法
this.GetButtonPower();
Funs.DropDownPageSize(this.ddlPageSize);
+ Funs.FineUIPleaseSelect(this.drpCertificateType);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
// 绑定表格
BindGrid();
@@ -181,6 +182,14 @@ namespace FineUIPro.Web.BaseInfo
{
this.txtCertificateCode.Text = certificate.CertificateCode;
this.txtCertificateName.Text = certificate.CertificateName;
+ if (!string.IsNullOrEmpty(certificate.CertificateType))
+ {
+ this.drpCertificateType.SelectedValue = certificate.CertificateType;
+ }
+ if (certificate.IsRegisterHSSE == true)
+ {
+ this.ckbIsRegisterHSSE.Checked = true;
+ }
this.txtRemark.Text = certificate.Remark;
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
@@ -201,8 +210,13 @@ namespace FineUIPro.Web.BaseInfo
{
CertificateCode = this.txtCertificateCode.Text.Trim(),
CertificateName = this.txtCertificateName.Text.Trim(),
+ IsRegisterHSSE = Convert.ToBoolean(this.ckbIsRegisterHSSE.Checked),
Remark = txtRemark.Text.Trim()
};
+ if (this.drpCertificateType.SelectedValue != BLL.Const._Null)
+ {
+ certificate.CertificateType = this.drpCertificateType.SelectedValue;
+ }
if (string.IsNullOrEmpty(strRowID))
{
certificate.CertificateId = SQLHelper.GetNewID(typeof(Model.Base_Certificate));
diff --git a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs
index 414ea9ff..8f67243e 100644
--- a/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/BaseInfo/Certificate.aspx.designer.cs
@@ -111,6 +111,24 @@ namespace FineUIPro.Web.BaseInfo {
///
protected global::FineUIPro.TextBox txtCertificateName;
+ ///
+ /// drpCertificateType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpCertificateType;
+
+ ///
+ /// ckbIsRegisterHSSE 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.CheckBox ckbIsRegisterHSSE;
+
///
/// txtRemark 控件。
///
diff --git a/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx b/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx
new file mode 100644
index 00000000..4e2e5b31
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx
@@ -0,0 +1,100 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskLevel.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.RiskLevel" %>
+
+
+
+
+
+ 风险等级
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.cs
new file mode 100644
index 00000000..46e67987
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.cs
@@ -0,0 +1,240 @@
+using BLL;
+using System;
+using System.Data;
+using System.Data.SqlClient;
+using System.Linq;
+
+namespace FineUIPro.Web.BaseInfo
+{
+ public partial class RiskLevel : PageBase
+ {
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ Funs.DropDownPageSize(this.ddlPageSize);
+ ////权限按钮方法
+ this.GetButtonPower();
+ btnNew.OnClientClick = Window1.GetShowReference("RiskLevelEdit.aspx") + "return false;";
+ ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
+ // 绑定表格
+ BindGrid();
+ }
+ }
+
+ ///
+ /// 绑定数据
+ ///
+ private void BindGrid()
+ {
+ string strSql = @"SELECT RiskLevelId
+ , RiskLevel
+ , RiskLevelName
+ , MinValue
+ , MaxValue
+ , ControlMeasures
+ , Days
+ , Remark
+ FROM dbo.Base_RiskLevel ";
+ SqlParameter[] parameter = null;
+ DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+ Grid1.RecordCount = tb.Rows.Count;
+ var table = this.GetPagedDataTable(Grid1, tb);
+ Grid1.DataSource = table;
+ Grid1.DataBind();
+ }
+ #endregion
+
+ #region 页索引改变事件
+ ///
+ /// 页索引改变事件
+ ///
+ ///
+ ///
+ protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+ {
+ Grid1.PageIndex = e.NewPageIndex;
+ BindGrid();
+ }
+ #endregion
+
+ #region 排序
+ ///
+ /// 排序
+ ///
+ ///
+ ///
+ protected void Grid1_Sort(object sender, GridSortEventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 分页选择下拉改变事件
+ ///
+ /// 分页选择下拉改变事件
+ ///
+ ///
+ ///
+ protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue);
+ BindGrid();
+ }
+ #endregion
+
+ #region 弹出编辑窗口关闭事件
+ ///
+ /// 弹出编辑窗体关闭事件
+ ///
+ ///
+ ///
+ protected void Window1_Close(object sender, WindowCloseEventArgs e)
+ {
+ BindGrid();
+ }
+ #endregion
+
+ #region 编辑
+ ///
+ /// Grid行双击事件
+ ///
+ ///
+ ///
+ protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// 右键编辑事件
+ ///
+ ///
+ ///
+ protected void btnMenuEdit_Click(object sender, EventArgs e)
+ {
+ this.EditData();
+ }
+
+ ///
+ /// 编辑数据方法
+ ///
+ private void EditData()
+ {
+ if (Grid1.SelectedRowIndexArray.Length == 0)
+ {
+ Alert.ShowInTop("请至少选择一条记录!", MessageBoxIcon.Warning);
+ return;
+ }
+ string RegisterTypesId = Grid1.SelectedRowID;
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("RiskLevelEdit.aspx?RiskLevelId={0}", RegisterTypesId, "编辑 - ")));
+ }
+ #endregion
+
+ #region 删除
+ ///
+ /// 右键删除事件
+ ///
+ ///
+ ///
+ protected void btnMenuDelete_Click(object sender, EventArgs e)
+ {
+ this.DeleteData();
+ }
+
+ ///
+ /// 删除方法
+ ///
+ private void DeleteData()
+ {
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HazardRegisterTypesMenuId, Const.BtnDelete))
+ {
+ if (Grid1.SelectedRowIndexArray.Length > 0)
+ {
+ bool isShow = false;
+ if (Grid1.SelectedRowIndexArray.Length == 1)
+ {
+ isShow = true;
+ }
+ foreach (int rowIndex in Grid1.SelectedRowIndexArray)
+ {
+ string rowID = Grid1.DataKeys[rowIndex][0].ToString();
+ if (this.judgementDelete(rowID, isShow))
+ {
+ var riskLevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x=>x.RiskLevelId==rowID);
+ if (riskLevel != null)
+ {
+ BLL.LogService.AddSys_Log(this.CurrUser, riskLevel.RiskLevelName, riskLevel.RiskLevelId, BLL.Const.RiskLevelMenuId, BLL.Const.BtnDelete);
+ Funs.DB.Base_RiskLevel.DeleteOnSubmit(riskLevel);
+ Funs.DB.SubmitChanges();
+ }
+ }
+ }
+ BindGrid();
+ ShowNotify("删除数据成功!(表格数据已重新绑定)", MessageBoxIcon.Success);
+ }
+ }
+ else
+ {
+ ShowNotify("您没有这个权限,请与管理员联系!");
+ }
+ }
+
+ ///
+ /// 判断是否可删除
+ ///
+ ///
+ ///
+ ///
+ private bool judgementDelete(string rowID, bool isShow)
+ {
+ string content = string.Empty;
+ if (string.IsNullOrEmpty(content))
+ {
+ return true;
+ }
+ else
+ {
+ if (isShow)
+ {
+ Alert.ShowInTop(content);
+ }
+ return false;
+ }
+ }
+ #endregion
+
+ #region 获取按钮权限
+ ///
+ /// 获取按钮权限
+ ///
+ ///
+ ///
+ private void GetButtonPower()
+ {
+ var buttonList = BLL.CommonService.GetAllButtonList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, BLL.Const.RiskLevelMenuId);
+ if (buttonList.Count() > 0)
+ {
+ if (buttonList.Contains(BLL.Const.BtnAdd))
+ {
+ this.btnNew.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnModify))
+ {
+ this.btnMenuEdit.Hidden = false;
+ }
+ if (buttonList.Contains(BLL.Const.BtnDelete))
+ {
+ this.btnMenuDelete.Hidden = false;
+ }
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.designer.cs
new file mode 100644
index 00000000..0c539389
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/RiskLevel.aspx.designer.cs
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.BaseInfo
+{
+
+
+ public partial class RiskLevel
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// Panel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Panel Panel1;
+
+ ///
+ /// Grid1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Grid Grid1;
+
+ ///
+ /// Toolbar2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar2;
+
+ ///
+ /// btnNew 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnNew;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.WebControls.Label Label1;
+
+ ///
+ /// ToolbarSeparator1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
+
+ ///
+ /// ToolbarText1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.ToolbarText ToolbarText1;
+
+ ///
+ /// ddlPageSize 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList ddlPageSize;
+
+ ///
+ /// Window1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Window Window1;
+
+ ///
+ /// Menu1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Menu Menu1;
+
+ ///
+ /// btnMenuEdit 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuEdit;
+
+ ///
+ /// btnMenuDelete 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.MenuButton btnMenuDelete;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx b/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx
new file mode 100644
index 00000000..eb8f2956
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx
@@ -0,0 +1,73 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="RiskLevelEdit.aspx.cs" Inherits="FineUIPro.Web.BaseInfo.RiskLevelEdit" %>
+
+
+
+
+
+ 风险等级
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.cs
new file mode 100644
index 00000000..05024139
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.cs
@@ -0,0 +1,118 @@
+using BLL;
+using System;
+using System.Linq;
+namespace FineUIPro.Web.BaseInfo
+{
+ public partial class RiskLevelEdit : PageBase
+ {
+ #region 定义项
+ ///
+ /// 问题巡检类型主键
+ ///
+ public string RiskLevelId
+ {
+ get
+ {
+ return (string)ViewState["RiskLevelId"];
+ }
+ set
+ {
+ ViewState["RiskLevelId"] = value;
+ }
+ }
+ #endregion
+
+ #region 加载页面
+ ///
+ /// 加载页面
+ ///
+ ///
+ ///
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ btnClose.OnClientClick = ActiveWindow.GetHideReference();
+
+ this.RiskLevelId = Request.QueryString["RiskLevelId"];
+ if (!string.IsNullOrEmpty(this.RiskLevelId))
+ {
+ var riskLevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x=>x.RiskLevelId==this.RiskLevelId);
+ if (riskLevel != null)
+ {
+ if (riskLevel.RiskLevel.HasValue)
+ {
+ this.txtRiskLevel.Text = riskLevel.RiskLevel.Value.ToString();
+ }
+ this.txtRiskLevelName.Text = riskLevel.RiskLevelName;
+ if (riskLevel.MinValue.HasValue)
+ {
+ this.txtMin.Text = riskLevel.MinValue.Value.ToString();
+ }
+ if (riskLevel.MaxValue.HasValue)
+ {
+ this.txtMax.Text = riskLevel.MaxValue.Value.ToString();
+ }
+ if (riskLevel.Days.HasValue)
+ {
+ this.txtDays.Text = riskLevel.Days.Value.ToString();
+ }
+ this.txtControlMeasures.Text = riskLevel.ControlMeasures;
+ this.txtRemark.Text = riskLevel.Remark;
+
+ }
+ }
+ }
+ }
+ #endregion
+
+ #region 保存数据
+ ///
+ /// 保存按钮
+ ///
+ ///
+ ///
+ protected void btnSave_Click(object sender, EventArgs e)
+ {
+ if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.RiskLevelMenuId, Const.BtnSave))
+ {
+ Model.Base_RiskLevel riskLevel = null;
+ if (string.IsNullOrEmpty(this.RiskLevelId))
+ {
+ riskLevel= new Model.Base_RiskLevel();
+ }
+ else
+ {
+ riskLevel = Funs.DB.Base_RiskLevel.FirstOrDefault(x=>x.RiskLevelId==this.RiskLevelId);
+ }
+
+ riskLevel.RiskLevelName = this.txtRiskLevelName.Text;
+ riskLevel.RiskLevel = int.Parse(this.txtRiskLevel.Text);
+ riskLevel.MinValue = int.Parse(this.txtMin.Text);
+ riskLevel.MaxValue = int.Parse(this.txtMax.Text);
+ riskLevel.Days = int.Parse(this.txtDays.Text);
+ riskLevel.ControlMeasures=this.txtControlMeasures.Text ;
+ riskLevel.Remark=this.txtRemark.Text ;
+
+ if (string.IsNullOrEmpty(this.RiskLevelId))
+ {
+ this.RiskLevelId = SQLHelper.GetNewID(typeof(Model.Base_RiskLevel));
+ riskLevel.RiskLevelId = this.RiskLevelId;
+ Funs.DB.Base_RiskLevel.InsertOnSubmit(riskLevel);
+ BLL.LogService.AddSys_Log(this.CurrUser, riskLevel.RiskLevelName, riskLevel.RiskLevelId, BLL.Const.HazardRegisterTypesMenuId,BLL.Const.BtnAdd);
+ }
+ else
+ {
+ BLL.LogService.AddSys_Log(this.CurrUser, riskLevel.RiskLevelName, riskLevel.RiskLevelId, BLL.Const.HazardRegisterTypesMenuId, BLL.Const.BtnModify);
+ }
+ Funs.DB.SubmitChanges();
+ PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+ }
+ else
+ {
+ ShowNotify("您没有这个权限,请与管理员联系!");
+ }
+ }
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.designer.cs
new file mode 100644
index 00000000..02fca92a
--- /dev/null
+++ b/SGGL/FineUIPro.Web/BaseInfo/RiskLevelEdit.aspx.designer.cs
@@ -0,0 +1,143 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为,如果
+// 重新生成代码,则所做更改将丢失。
+// 自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.BaseInfo
+{
+
+
+ public partial class RiskLevelEdit
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+ ///
+ /// PageManager1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.PageManager PageManager1;
+
+ ///
+ /// SimpleForm1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form SimpleForm1;
+
+ ///
+ /// txtRiskLevelName 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtRiskLevelName;
+
+ ///
+ /// txtRiskLevel 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtRiskLevel;
+
+ ///
+ /// txtMin 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtMin;
+
+ ///
+ /// txtMax 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtMax;
+
+ ///
+ /// txtDays 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtDays;
+
+ ///
+ /// NumberBox4 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox NumberBox4;
+
+ ///
+ /// txtControlMeasures 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtControlMeasures;
+
+ ///
+ /// txtRemark 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextArea txtRemark;
+
+ ///
+ /// Toolbar1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Toolbar Toolbar1;
+
+ ///
+ /// btnSave 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnSave;
+
+ ///
+ /// btnClose 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Button btnClose;
+ }
+}
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx
index 0af6227e..88205b3c 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx
@@ -36,6 +36,12 @@
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
index 1ddcf0d7..56b39141 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.cs
@@ -67,7 +67,10 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.drpUnitIds.SelectedValueArray = designDetails.UnitName.Split(',');
}
-
+ if (designDetails.JoinPersonNum != null)
+ {
+ this.txtJoinPersonNum.Text = designDetails.JoinPersonNum.ToString();
+ }
var currApprove = DesignDetailsApproveService.GetCurrentApprove(designDetails.DesignDetailsId);
if (currApprove != null)
@@ -190,7 +193,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
ids = ids.Substring(0, ids.LastIndexOf(","));
}
designDetails.UnitWorkId = ids;
-
+ designDetails.JoinPersonNum = Funs.GetNewIntOrZero(this.txtJoinPersonNum.Text.Trim());
string unitIds = string.Empty;
var units = this.drpUnitIds.SelectedValueArray;
foreach (var item in units)
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs
index a1d07333..3bc941c3 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/DesignDetailsEdit.aspx.designer.cs
@@ -7,13 +7,11 @@
// 自动生成>
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.CQMS.Comprehensive
-{
-
-
- public partial class DesignDetailsEdit
- {
-
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class DesignDetailsEdit {
+
///
/// form1 控件。
///
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// SimpleForm1 控件。
///
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
/// drpCNProfessionalId 控件。
///
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpCNProfessionalId;
-
+
///
/// txtDesignDetailsCode 控件。
///
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtDesignDetailsCode;
-
+
///
/// txtDetailsMan 控件。
///
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtDetailsMan;
-
+
///
/// txtDetailsDate 控件。
///
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DatePicker txtDetailsDate;
-
+
///
/// drpUnitWorks 控件。
///
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpUnitWorks;
-
+
///
/// drpUnitIds 控件。
///
@@ -94,7 +92,25 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpUnitIds;
-
+
+ ///
+ /// txtJoinPersonNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtJoinPersonNum;
+
+ ///
+ /// TextBox1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox TextBox1;
+
///
/// Panel2 控件。
///
@@ -103,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Panel Panel2;
-
+
///
/// Label1 控件。
///
@@ -112,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Label Label1;
-
+
///
/// btnAttach 控件。
///
@@ -121,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnAttach;
-
+
///
/// Toolbar1 控件。
///
@@ -130,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
/// hdAttachUrl 控件。
///
@@ -139,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.HiddenField hdAttachUrl;
-
+
///
/// btnSave 控件。
///
@@ -148,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnSave;
-
+
///
/// WindowAtt 控件。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
index 89433ef5..57205b71 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachine.aspx
@@ -115,7 +115,7 @@
+ Width="900px" Height="510px">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ LabelWidth="140px" LabelAlign="Right">
@@ -79,8 +91,6 @@
-
-
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
index 2777c673..3ec7a968 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.cs
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
GetButtonPower();
BLL.UnitService.InitUnitDownList(this.drpUnitId, this.CurrUser.LoginProjectId, true);
- if (CurrUser.UnitId == null || CurrUser.UnitId == Const.sysglyId)
+ if (CurrUser.UnitId == null || CurrUser.UserId == Const.sysglyId||CurrUser.UnitId== Const.UnitId_CD)
{
this.drpUnitId.Enabled = true;
}
@@ -77,6 +77,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
}
this.txtTestCycle.Text = inspectionMachine.TestCycle;
this.rblIsVerification.SelectedValue = inspectionMachine.IsVerification.HasValue && inspectionMachine.IsVerification == true ? "true" : "false";
+ this.rblIsCheckOK.SelectedValue = inspectionMachine.IsCheckOK.HasValue && inspectionMachine.IsCheckOK == true ? "true" : "false";
if (inspectionMachine.InspectionDate != null)
{
this.txtInspectionDate.Text = string.Format("{0:yyyy-MM-dd}", inspectionMachine.InspectionDate);
@@ -97,7 +98,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
var currApprove = InspectionMachineApproveService.GetCurrentApprove(inspectionMachine.InspectionMachineId);
if (currApprove != null)
{ //重新编制 编制人 可以 显示 提交 保存按钮
-
+ this.drpAudit.SelectedValue = currApprove.ApproveMan;
if (currApprove.ApproveType == BLL.Const.Comprehensive_ReCompile && inspectionMachine.CompileMan == CurrUser.UserId)
{
this.btnSubmit.Hidden = false;
@@ -209,6 +210,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
+ inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
@@ -288,6 +290,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
inspectionMachone.NextTestDate = Funs.GetNewDateTime(this.txtNextTestDate.Text);
inspectionMachone.TestCycle = this.txtTestCycle.Text.Trim();
inspectionMachone.IsVerification = this.rblIsVerification.SelectedValue == "true" ? true : false;
+ inspectionMachone.IsCheckOK = this.rblIsCheckOK.SelectedValue == "true" ? true : false;
inspectionMachone.InspectionDate = Funs.GetNewDateTime(this.txtInspectionDate.Text);
inspectionMachone.IsOnSite = this.rblIsOnSite.SelectedValue == "true" ? true : false;
inspectionMachone.LeaveDate = Funs.GetNewDateTime(this.txtLeaveDate.Text);
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs
index fedf6cd1..95b5c957 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionMachineEdit.aspx.designer.cs
@@ -7,13 +7,11 @@
// 自动生成>
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.CQMS.Comprehensive
-{
-
-
- public partial class InspectionMachineEdit
- {
-
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class InspectionMachineEdit {
+
///
/// form1 控件。
///
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// SimpleForm1 控件。
///
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
/// drpUnitId 控件。
///
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpUnitId;
-
+
///
/// txtInspectionMachineCode 控件。
///
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtInspectionMachineCode;
-
+
///
/// txtInspectionMachineName 控件。
///
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtInspectionMachineName;
-
+
///
/// drpCNProfessionalId 控件。
///
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpCNProfessionalId;
-
+
///
/// rblInspectionType 控件。
///
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RadioButtonList rblInspectionType;
-
+
///
/// txtSpecificationModel 控件。
///
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtSpecificationModel;
-
+
///
/// txtNextTestDate 控件。
///
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DatePicker txtNextTestDate;
-
+
///
/// txtTestCycle 控件。
///
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtTestCycle;
-
+
///
/// rblIsVerification 控件。
///
@@ -121,7 +119,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RadioButtonList rblIsVerification;
-
+
+ ///
+ /// rblIsCheckOK 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblIsCheckOK;
+
///
/// txtUnitsCount 控件。
///
@@ -130,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.NumberBox txtUnitsCount;
-
+
///
/// txtInspectionDate 控件。
///
@@ -139,7 +146,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DatePicker txtInspectionDate;
-
+
///
/// txtLeaveDate 控件。
///
@@ -148,7 +155,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DatePicker txtLeaveDate;
-
+
///
/// rblIsOnSite 控件。
///
@@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RadioButtonList rblIsOnSite;
-
+
///
/// Panel2 控件。
///
@@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Panel Panel2;
-
+
///
/// Label1 控件。
///
@@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Label Label1;
-
+
///
/// btnAttach 控件。
///
@@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnAttach;
-
+
///
/// drpAudit 控件。
///
@@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpAudit;
-
+
///
/// agree 控件。
///
@@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.FormRow agree;
-
+
///
/// rblIsAgree 控件。
///
@@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RadioButtonList rblIsAgree;
-
+
///
/// options 控件。
///
@@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.FormRow options;
-
+
///
/// txtidea 控件。
///
@@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextArea txtidea;
-
+
///
/// Toolbar1 控件。
///
@@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
/// hdAttachUrl 控件。
///
@@ -247,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.HiddenField hdAttachUrl;
-
+
///
/// btnSave 控件。
///
@@ -256,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnSave;
-
+
///
/// btnSubmit 控件。
///
@@ -265,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnSubmit;
-
+
///
/// WindowAtt 控件。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
index 929e3985..ac4ff068 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx
@@ -62,6 +62,10 @@
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
index 005598c4..b767b1d8 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.cs
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
this.txtApprovalTime.Text = string.Format("{0:yyyy-MM-dd}", inspectionPerson.ApprovalTime);
}
+ this.rblIsTrain.SelectedValue = inspectionPerson.IsTrain.HasValue && inspectionPerson.IsTrain == true ? "true" : "false";
this.rblIsOnSite.SelectedValue = inspectionPerson.IsOnSite.HasValue && inspectionPerson.IsOnSite == true ? "true" : "false";
if (inspectionPerson.DepartureTime != null)
{
@@ -266,7 +267,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
inspectionPerson.IsOnSite = false;
}
-
+ if (this.rblIsTrain.SelectedValue == "true")
+ {
+ inspectionPerson.IsTrain = true;
+ }
+ else
+ {
+ inspectionPerson.IsTrain = false;
+ }
if (!string.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
{
inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
@@ -415,7 +423,14 @@ namespace FineUIPro.Web.CQMS.Comprehensive
{
inspectionPerson.IsOnSite = false;
}
-
+ if (this.rblIsTrain.SelectedValue == "true")
+ {
+ inspectionPerson.IsTrain = true;
+ }
+ else
+ {
+ inspectionPerson.IsTrain = false;
+ }
if (!string.IsNullOrEmpty(this.txtDepartureTime.Text.ToString()))
{
inspectionPerson.DepartureTime = Convert.ToDateTime(this.txtDepartureTime.Text.ToString());
diff --git a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs
index e18a933b..095ca5e7 100644
--- a/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/Comprehensive/InspectionPersonEdit.aspx.designer.cs
@@ -7,13 +7,11 @@
// 自动生成>
//------------------------------------------------------------------------------
-namespace FineUIPro.Web.CQMS.Comprehensive
-{
-
-
- public partial class InspectionPersonEdit
- {
-
+namespace FineUIPro.Web.CQMS.Comprehensive {
+
+
+ public partial class InspectionPersonEdit {
+
///
/// form1 控件。
///
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+
///
/// PageManager1 控件。
///
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.PageManager PageManager1;
-
+
///
/// SimpleForm1 控件。
///
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Form SimpleForm1;
-
+
///
/// drpUnitId 控件。
///
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpUnitId;
-
+
///
/// txtInspectionCode 控件。
///
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtInspectionCode;
-
+
///
/// drpCNProfessionalId 控件。
///
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpCNProfessionalId;
-
+
///
/// drpUnitWorkIds 控件。
///
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpUnitWorkIds;
-
+
///
/// drpPostId 控件。
///
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpPostId;
-
+
///
/// txtPersonName 控件。
///
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtPersonName;
-
+
///
/// txtCertificateNumber 控件。
///
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtCertificateNumber;
-
+
///
/// txtQualifiedProjectCode 控件。
///
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtQualifiedProjectCode;
-
+
///
/// txtApprovalTime 控件。
///
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DatePicker txtApprovalTime;
-
+
///
/// txtValidityDate 控件。
///
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DatePicker txtValidityDate;
-
+
///
/// txtDepartureTime 控件。
///
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DatePicker txtDepartureTime;
-
+
///
/// rblIsOnSite 控件。
///
@@ -148,7 +146,16 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RadioButtonList rblIsOnSite;
-
+
+ ///
+ /// rblIsTrain 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.RadioButtonList rblIsTrain;
+
///
/// txtRemark 控件。
///
@@ -157,7 +164,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextBox txtRemark;
-
+
///
/// Panel2 控件。
///
@@ -166,7 +173,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Panel Panel2;
-
+
///
/// Label1 控件。
///
@@ -175,7 +182,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Label Label1;
-
+
///
/// btnAttach 控件。
///
@@ -184,7 +191,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnAttach;
-
+
///
/// drpAudit 控件。
///
@@ -193,7 +200,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.DropDownList drpAudit;
-
+
///
/// agree 控件。
///
@@ -202,7 +209,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.FormRow agree;
-
+
///
/// rblIsAgree 控件。
///
@@ -211,7 +218,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.RadioButtonList rblIsAgree;
-
+
///
/// options 控件。
///
@@ -220,7 +227,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.FormRow options;
-
+
///
/// txtidea 控件。
///
@@ -229,7 +236,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.TextArea txtidea;
-
+
///
/// Toolbar1 控件。
///
@@ -238,7 +245,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Toolbar Toolbar1;
-
+
///
/// hdAttachUrl 控件。
///
@@ -247,7 +254,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.HiddenField hdAttachUrl;
-
+
///
/// btnSave 控件。
///
@@ -256,7 +263,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnSave;
-
+
///
/// btnSubmit 控件。
///
@@ -265,7 +272,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
///
protected global::FineUIPro.Button btnSubmit;
-
+
///
/// WindowAtt 控件。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx
index cf20f298..7f6ef423 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx
@@ -42,6 +42,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -50,7 +61,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs
index 464c38dc..84af102e 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.cs
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
string divisionId = Request.Params["divisionId"];
BreakdownId = Request.Params["breakdownId"];
+ Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
Model.WBS_Breakdown breakdown = BLL.BreakdownService.GetBreakdownById(BreakdownId);
var division = BLL.DivisionService.GetDivisionById(divisionId);
if (division != null)
@@ -77,6 +78,10 @@ namespace FineUIPro.Web.CQMS.WBS
{
this.txtSortIndex.Text = breakdown.SortIndex.ToString();
}
+ if (!string.IsNullOrEmpty(breakdown.CheckAcceptType))
+ {
+ this.drpCheckAcceptType.SelectedValue = breakdown.CheckAcceptType;
+ }
this.txtRemark.Text = breakdown.Remark;
}
}
@@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.WuHuan = this.WuHuan.Text.Trim();
newBreakdown.JianLi = this.JianLi.Text.Trim();
newBreakdown.YeZhu = this.YeZhu.Text.Trim();
+ if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
+ {
+ newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
+ }
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@@ -136,42 +145,6 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.BreakdownId = this.BreakdownId;
}
BLL.BreakdownService.AddBreakdown(newBreakdown);
- //增加项目单位工程记录
- var projects = BLL.ProjectService.GetProjectWorkList();
- foreach (var project in projects)
- {
- var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == project.ProjectId orderby x.UnitWorkCode select x;
- foreach (var unitWork in unitWorks)
- {
- var divisionProject = BLL.DivisionProjectService.GetDivisionProjectByUnitWorkIdAndOldDivisionId(unitWork.UnitWorkId, divisionId);
- if (divisionProject != null)
- {
- Model.WBS_BreakdownProject bp = new Model.WBS_BreakdownProject();
- bp.BreakdownProjectId = SQLHelper.GetNewID(typeof(Model.WBS_BreakdownProject));
- bp.ProjectId = project.ProjectId;
- bp.BreakdownCode = newBreakdown.BreakdownCode;
- bp.BreakdownName = newBreakdown.BreakdownName;
- bp.DivisionProjectId = divisionProject.DivisionProjectId;
- bp.Basis = newBreakdown.Basis;
- bp.CheckPoints = newBreakdown.CheckPoints;
- bp.RecordAndCode = newBreakdown.RecordAndCode;
- bp.Class = newBreakdown.Class;
- bp.SortIndex = newBreakdown.SortIndex;
- bp.Remark = newBreakdown.Remark;
- bp.ModelURL = newBreakdown.ModelURL;
- bp.UnitWorkId = unitWork.UnitWorkId;
- bp.IsAcceptance = newBreakdown.IsAcceptance;
- bp.IsYellow = newBreakdown.IsYellow;
- bp.WuHuan = newBreakdown.WuHuan;
- bp.JianLi = newBreakdown.JianLi;
- bp.FenBao = newBreakdown.FenBao;
- bp.YeZhu = newBreakdown.YeZhu;
- bp.SourceBreakdownId = newBreakdown.BreakdownId;
-
- BLL.BreakdownProjectService.AddBreakdownProject(bp);
- }
- }
- }
BLL.LogService.AddSys_Log(this.CurrUser, newBreakdown.BreakdownCode, newBreakdown.BreakdownId, BLL.Const.ControlPointMenuId, "添加分项工程信息!");
}
if (Request.Params["type"] == "modify")
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs
index eee1abda..c711f7bc 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdown.aspx.designer.cs
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.WBS {
///
protected global::FineUIPro.TextBox txtClass;
+ ///
+ /// drpCheckAcceptType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpCheckAcceptType;
+
///
/// tr1 控件。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx
index 775c491c..dce0097e 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx
@@ -42,6 +42,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -50,7 +61,7 @@
-
+
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
index f88d8de1..bb089b55 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.cs
@@ -33,6 +33,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
string divisionProjectId = Request.Params["divisionProjectId"];
BreakdownProjectId = Request.Params["breakdownProjectId"];
+ Funs.FineUIPleaseSelect(this.drpCheckAcceptType);
Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(BreakdownProjectId);
var division = BLL.DivisionProjectService.GetDivisionProjectById(divisionProjectId);
if (division != null)
@@ -73,6 +74,10 @@ namespace FineUIPro.Web.CQMS.WBS
this.JianLi.Text = breakdownProject.JianLi;
this.WuHuan.Text = breakdownProject.WuHuan;
this.FenBao.Text = breakdownProject.FenBao;
+ if (!string.IsNullOrEmpty(breakdownProject.CheckAcceptType))
+ {
+ this.drpCheckAcceptType.SelectedValue = breakdownProject.CheckAcceptType;
+ }
if (breakdownProject.SortIndex != null)
{
this.txtSortIndex.Text = breakdownProject.SortIndex.ToString();
@@ -103,6 +108,10 @@ namespace FineUIPro.Web.CQMS.WBS
newBreakdown.WuHuan = this.WuHuan.Text.Trim();
newBreakdown.JianLi = this.JianLi.Text.Trim();
newBreakdown.YeZhu = this.YeZhu.Text.Trim();
+ if (this.drpCheckAcceptType.SelectedValue != BLL.Const._Null)
+ {
+ newBreakdown.CheckAcceptType = this.drpCheckAcceptType.SelectedValue;
+ }
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@@ -143,7 +152,9 @@ namespace FineUIPro.Web.CQMS.WBS
}
if (Request.Params["type"] == "modify")
{
+ Model.WBS_BreakdownProject breakdownProject = BLL.BreakdownProjectService.GetBreakdownProjectById(BreakdownProjectId);
newBreakdown.BreakdownProjectId = BreakdownProjectId;
+ newBreakdown.IsSelected = breakdownProject.IsSelected;
BLL.BreakdownProjectService.UpdateBreakdownProject(newBreakdown);
BLL.LogService.AddSys_Log(this.CurrUser, newBreakdown.BreakdownCode, BreakdownProjectId, BLL.Const.ProjectControlPointMenuId, "修改分项工程信息!");
}
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs
index d7449c3d..939f2385 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditBreakdownProject.aspx.designer.cs
@@ -93,6 +93,15 @@ namespace FineUIPro.Web.CQMS.WBS {
///
protected global::FineUIPro.TextBox txtClass;
+ ///
+ /// drpCheckAcceptType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpCheckAcceptType;
+
///
/// tr1 控件。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx
index 927e71c4..af19d062 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx
@@ -23,6 +23,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs
index 6a2f4b07..8b4364ea 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.cs
@@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
string selectedCode = Request.Params["selectedCode"];
+ Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode);
@@ -50,6 +51,10 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_Division divisionProject = BLL.DivisionService.GetDivisionById(selectedCode);
this.txtDivisionCode.Text = divisionProject.DivisionCode;
this.txtDivisionName.Text = divisionProject.DivisionName;
+ if (!string.IsNullOrEmpty(divisionProject.SubItemType))
+ {
+ this.drpSubItemType.SelectedValue = divisionProject.SubItemType;
+ }
if (divisionProject.SortIndex != null)
{
this.txtSortIndex.Text = divisionProject.SortIndex.ToString();
@@ -65,6 +70,11 @@ namespace FineUIPro.Web.CQMS.WBS
///
protected void btnSave_Click(object sender, EventArgs e)
{
+ if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
+ {
+ ShowNotify("请选择分部分项类型!", MessageBoxIcon.Warning);
+ return;
+ }
if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim()))
{
string selectedCode = Request.Params["selectedCode"];
@@ -75,6 +85,7 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_Division newDivision = new Model.WBS_Division();
newDivision.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivision.DivisionName = this.txtDivisionName.Text.Trim();
+ newDivision.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@@ -102,51 +113,6 @@ namespace FineUIPro.Web.CQMS.WBS
newDivision.SuperDivisionId = selectedCode;
}
BLL.DivisionService.AddDivision(newDivision);
- //增加项目单位工程记录
- var projects = BLL.ProjectService.GetProjectWorkList();
- foreach (var project in projects)
- {
- var unitWorks = from x in Funs.DB.WBS_UnitWork where x.ProjectId == project.ProjectId orderby x.UnitWorkCode select x;
- foreach (var unitWork in unitWorks)
- {
- Model.WBS_DivisionProject newDivisionProject = new Model.WBS_DivisionProject();
- newDivisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
- newDivisionProject.DivisionName = this.txtDivisionName.Text.Trim();
- newDivisionProject.UnitWorkId = unitWork.UnitWorkId;
- if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
- {
- try
- {
- newDivisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
- }
- catch (Exception)
- {
- ShowNotify("排序只能为整数!", MessageBoxIcon.Warning);
- return;
- }
- }
- if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
- {
- newDivisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
- }
- newDivisionProject.DivisionProjectId = SQLHelper.GetNewID(typeof(Model.WBS_DivisionProject));
- if (cNProfessional != null) //专业节点增加分部
- {
- newDivisionProject.CNProfessionalId = selectedCode;
- }
- if (divisionProject != null) //分部节点增加子分部
- {
- var dp = BLL.DivisionProjectService.GetDivisionProjectByUnitWorkIdAndOldDivisionId(unitWork.UnitWorkId, selectedCode);
- if (dp != null)
- {
- newDivisionProject.SuperDivisionId = dp.DivisionProjectId;
- }
- }
- newDivisionProject.ProjectId = project.ProjectId;
- newDivisionProject.OldDivisionId = newDivision.DivisionId;
- BLL.DivisionProjectService.AddDivisionProject(newDivisionProject);
- }
- }
BLL.LogService.AddSys_Log(this.CurrUser, newDivision.DivisionCode, newKeyID, BLL.Const.ProjectControlPointMenuId, "添加分部或子分部工程信息!");
PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(newKeyID) + ActiveWindow.GetHidePostBackReference());
}
@@ -154,6 +120,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
divisionProject.DivisionName = this.txtDivisionName.Text.Trim();
+ divisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs
index 29fc5943..358a04da 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivision.aspx.designer.cs
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
///
protected global::FineUIPro.TextBox txtDivisionCode;
+ ///
+ /// drpSubItemType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpSubItemType;
+
///
/// txtSortIndex 控件。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx
index baa8f264..062b25bd 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx
@@ -23,6 +23,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs
index 2fe04461..aef048a4 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.cs
@@ -30,6 +30,7 @@ namespace FineUIPro.Web.CQMS.WBS
if (!IsPostBack)
{
string selectedCode = Request.Params["selectedCode"];
+ Funs.FineUIPleaseSelect(this.drpSubItemType);
if (Request.Params["type"] == "add")
{
Model.Base_CNProfessional cNProfessional = BLL.CNProfessionalService.GetCNProfessional(selectedCode);
@@ -51,6 +52,10 @@ namespace FineUIPro.Web.CQMS.WBS
Model.WBS_DivisionProject divisionProject = BLL.DivisionProjectService.GetDivisionProjectById(selectedCode);
this.txtDivisionCode.Text = divisionProject.DivisionCode;
this.txtDivisionName.Text = divisionProject.DivisionName;
+ if (!string.IsNullOrEmpty(divisionProject.SubItemType))
+ {
+ this.drpSubItemType.SelectedValue = divisionProject.SubItemType;
+ }
if (divisionProject.SortIndex != null)
{
this.txtSortIndex.Text = divisionProject.SortIndex.ToString();
@@ -66,6 +71,11 @@ namespace FineUIPro.Web.CQMS.WBS
///
protected void btnSave_Click(object sender, EventArgs e)
{
+ if (this.drpSubItemType.SelectedValue == BLL.Const._Null)
+ {
+ ShowNotify("请选择分部分项类型!", MessageBoxIcon.Warning);
+ return;
+ }
if (!string.IsNullOrEmpty(this.txtDivisionName.Text.Trim()))
{
string selectedCode = Request.Params["selectedCode"];
@@ -77,6 +87,7 @@ namespace FineUIPro.Web.CQMS.WBS
newDivisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
newDivisionProject.DivisionName = this.txtDivisionName.Text.Trim();
newDivisionProject.UnitWorkId = Request.Params["unitWorkId"];
+ newDivisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
try
@@ -112,6 +123,7 @@ namespace FineUIPro.Web.CQMS.WBS
{
divisionProject.DivisionCode = this.txtDivisionCode.Text.Trim();
divisionProject.DivisionName = this.txtDivisionName.Text.Trim();
+ divisionProject.SubItemType = this.drpSubItemType.SelectedValue;
if (!string.IsNullOrEmpty(this.txtSortIndex.Text.Trim()))
{
divisionProject.SortIndex = Convert.ToInt32(this.txtSortIndex.Text.Trim());
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs
index fc997d47..f6a7a556 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/EditDivisionProject.aspx.designer.cs
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.CQMS.WBS {
///
protected global::FineUIPro.TextBox txtDivisionCode;
+ ///
+ /// drpSubItemType 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.DropDownList drpSubItemType;
+
///
/// txtSortIndex 控件。
///
diff --git a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
index 5db9c6df..23e76f22 100644
--- a/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/WBS/ProjectControlPoint.aspx.cs
@@ -200,37 +200,97 @@ namespace FineUIPro.Web.CQMS.WBS
{
cNProfessionalId = e.NodeID.Split('|')[1];
}
- var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
- where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
- orderby x.SortIndex
- select x).ToList();
- foreach (var q in divisions)
+ if (cNProfessionalId == BLL.Const.CNProfessionalConstructId)
{
- TreeNode newNode = new TreeNode();
- newNode.Text = q.DivisionName;
- newNode.NodeID = q.DivisionProjectId;
- newNode.CommandName = "DivisionProject";
- newNode.EnableExpandEvent = true;
- newNode.EnableClickEvent = true;
- newNode.EnableCheckBox = true;
- newNode.EnableCheckEvent = true;
- e.Node.Nodes.Add(newNode);
- if (q.IsSelected == true)
- {
- newNode.Checked = true;
- }
- var list = (from x in Funs.DB.WBS_DivisionProject
- where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
- orderby x.SortIndex
- select x).ToList();
- if (list.Count > 0)
+ var divisionsCV = (from x in BLL.Funs.DB.WBS_DivisionProject
+ where x.CNProfessionalId == BLL.Const.CNProfessionalCVId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId && x.IsSelected == true
+ orderby x.SortIndex
+ select x).ToList();
+ if (divisionsCV.Count > 0) //建筑工程下存在土建内容
{
+ TreeNode newNode = new TreeNode();
+ newNode.Text = "土建";
+ newNode.NodeID = BLL.Const.CNProfessionalCVId;
+ newNode.CommandName = "CNProfessional";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ e.Node.Nodes.Add(newNode);
TreeNode tempNode = new TreeNode();
tempNode.NodeID = "";
tempNode.Text = "";
+ tempNode.EnableExpandEvent = true;
+ tempNode.EnableClickEvent = true;
newNode.Nodes.Add(tempNode);
}
+ else
+ {
+ var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
+ where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+ orderby x.SortIndex
+ select x).ToList();
+ foreach (var q in divisions)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = q.DivisionName;
+ newNode.NodeID = q.DivisionProjectId;
+ newNode.CommandName = "DivisionProject";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ newNode.EnableCheckEvent = true;
+ e.Node.Nodes.Add(newNode);
+ if (q.IsSelected == true)
+ {
+ newNode.Checked = true;
+ }
+ var list = (from x in Funs.DB.WBS_DivisionProject
+ where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+ orderby x.SortIndex
+ select x).ToList();
+ if (list.Count > 0)
+ {
+ TreeNode tempNode = new TreeNode();
+ tempNode.NodeID = "";
+ tempNode.Text = "";
+ newNode.Nodes.Add(tempNode);
+ }
+ }
+ }
+ }
+ else
+ {
+ var divisions = (from x in BLL.Funs.DB.WBS_DivisionProject
+ where x.CNProfessionalId == cNProfessionalId && x.ProjectId == this.CurrUser.LoginProjectId && x.SuperDivisionId == null && x.UnitWorkId == unitWorkId
+ orderby x.SortIndex
+ select x).ToList();
+ foreach (var q in divisions)
+ {
+ TreeNode newNode = new TreeNode();
+ newNode.Text = q.DivisionName;
+ newNode.NodeID = q.DivisionProjectId;
+ newNode.CommandName = "DivisionProject";
+ newNode.EnableExpandEvent = true;
+ newNode.EnableClickEvent = true;
+ newNode.EnableCheckBox = true;
+ newNode.EnableCheckEvent = true;
+ e.Node.Nodes.Add(newNode);
+ if (q.IsSelected == true)
+ {
+ newNode.Checked = true;
+ }
+ var list = (from x in Funs.DB.WBS_DivisionProject
+ where x.SuperDivisionId == q.DivisionProjectId && x.ProjectId == this.CurrUser.LoginProjectId
+ orderby x.SortIndex
+ select x).ToList();
+ if (list.Count > 0)
+ {
+ TreeNode tempNode = new TreeNode();
+ tempNode.NodeID = "";
+ tempNode.Text = "";
+ newNode.Nodes.Add(tempNode);
+ }
+
+ }
}
}
else if (e.Node.CommandName == "DivisionProject") //展开分部节点
@@ -303,8 +363,8 @@ namespace FineUIPro.Web.CQMS.WBS
{
if (string.IsNullOrEmpty(superDivisionProject.SuperDivisionId))
{
- // if (!string.IsNullOrEmpty(superDivisionProject.CNProfessionalId))
- //{
+ // if (!string.IsNullOrEmpty(superDivisionProject.CNProfessionalId))
+ //{
superDivisionProject.IsSelected = b;
BLL.DivisionProjectService.UpdateDivisionProject(superDivisionProject);
}
diff --git a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
index 79c38559..688c6c15 100644
--- a/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Accident.aspx.cs
@@ -27,7 +27,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
- this.Panel1.Title = "事故事件数据(" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + ")";
+ this.Panel1.Title = "事故事件数据(" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + ")";
}
}
diff --git a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
index 89228f57..d10d40ca 100644
--- a/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Check.aspx.cs
@@ -28,7 +28,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
- this.Panel1.Title = "安全监督检查数据(" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + ")";
+ this.Panel1.Title = "安全监督检查数据(" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + ")";
}
}
diff --git a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
index 62a279c8..708fff47 100644
--- a/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/CompanyPerson.aspx.cs
@@ -21,9 +21,9 @@ namespace FineUIPro.Web.DataShow
{
Funs.DropDownPageSize(this.ddlPageSize);
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
- // 绑定表格
+ // 绑定表格t
BindGrid();
- this.Panel1.Title = "企业总部/分支机构安全人员(" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + ")";
+ this.Panel1.Title = "企业总部/分支机构安全人员(" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + ")";
}
}
diff --git a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
index 579caa73..e0286836 100644
--- a/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/ConstructionEquipment.aspx.cs
@@ -26,7 +26,7 @@ namespace FineUIPro.Web.DataShow
BLL.ProjectService.InitProjectDropDownList(this.drpProject, true);
// 绑定表格t
BindGrid();
- this.Panel1.Title = "施工机具设备(" + BLL.UnitService.GetUnitNameByUnitId(BLL.CommonService.GetThisUnitId()) + ")";
+ this.Panel1.Title = "施工机具设备(" + BLL.UnitService.GetUnitNameByUnitId(BLL.Const.UnitId_CD) + ")";
}
}
diff --git a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
index 0e23bead..73d5adbc 100644
--- a/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/Environmental.aspx
@@ -61,7 +61,7 @@
-
private void BindGrid()
{
- string strSql = @"SELECT NEWID() AS ID,Project.ProjectId,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
+ string strSql = @"SELECT NEWID() AS ID,Project.ProjectId,Project.ProjectCode,Project.ProjectName,Defects_Definition,COUNT(Item.CHT_CheckItemID) AS Counts
FROM CH_CheckItem AS Item
LEFT JOIN CH_Check AS Checks ON Item.CHT_CheckID =Checks.CHT_CheckID
LEFT JOIN Base_Project AS Project ON Checks.ProjectId =Project.ProjectId
- WHERE 1=1 ";
+ WHERE 1=1 ";
List listStr = new List();
if (this.drpProject.SelectedValue != Const._Null)
@@ -59,7 +59,7 @@ namespace FineUIPro.Web.DataShow
// strSql += " AND h.RegisterDate <=@EndTime";
// listStr.Add(new SqlParameter("@EndTime", this.txtEndTime.Text));
//}
- strSql += " GROUP BY Project.ProjectId,Project.ProjectName,Defects_Definition";
+ strSql += " GROUP BY Project.ProjectId,Project.ProjectName,Project.ProjectCode,Defects_Definition";
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
Grid1.RecordCount = tb.Rows.Count;
diff --git a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
index 2c8fffb2..87b6b3e1 100644
--- a/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HJGLWelding.aspx.cs
@@ -35,7 +35,7 @@ namespace FineUIPro.Web.DataShow
///
private void BindGrid()
{
- string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
+ string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List listStr = new List();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
index 7204a978..73478c46 100644
--- a/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectification.aspx.cs
@@ -34,7 +34,7 @@ namespace FineUIPro.Web.DataShow
///
private void BindGrid()
{
- string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
+ string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List listStr = new List();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
diff --git a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
index 98ccf094..0314bba3 100644
--- a/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/HiddenRectificationItem.aspx.cs
@@ -168,7 +168,7 @@ namespace FineUIPro.Web.DataShow
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
- url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.ImageUrl);
+ url = BLL.UploadAttachmentService.ShowImage("../", registration.ImageUrl);
}
}
return url;
@@ -194,7 +194,7 @@ namespace FineUIPro.Web.DataShow
var registration = BLL.HSSE_Hazard_HazardRegisterService.GetHazardRegisterByHazardRegisterId(registrationId.ToString());
if (registration != null)
{
- url = BLL.UploadAttachmentService.ShowImage(httpUrl, registration.RectificationImageUrl);
+ url = BLL.UploadAttachmentService.ShowImage("../", registration.RectificationImageUrl);
}
}
return url;
diff --git a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
index 8de1230b..a0c06cb1 100644
--- a/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/LargeEngineering.aspx.cs
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.DataShow
///
private void BindGrid()
{
- string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 and (isDelete IS NULL OR isDelete =0) ";
+ string strSql = @"select ProjectId,ProjectCode, ProjectName from Base_Project where ProjectState =1 ";
List listStr = new List();
string cpara = string.Empty;
if (this.drpProject.SelectedValue != Const._Null)
diff --git a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
index efefd5f8..e4d9b980 100644
--- a/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/License.aspx.cs
@@ -37,7 +37,7 @@ namespace FineUIPro.Web.DataShow
string strSql = string.Empty;
List listStr = new List();
- strSql = @"SELECT V.LicenseManagerId,V.ProjectId,V.ProjectCode,V.ProjectName,V.LicenseTypeName,V.UnitName,V.UnitTypeName
+ 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
diff --git a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
index 9c39ca65..6b56e415 100644
--- a/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
+++ b/SGGL/FineUIPro.Web/DataShow/Project.aspx.cs
@@ -38,7 +38,7 @@ namespace FineUIPro.Web.DataShow
+ @" FROM Base_Project AS Project LEFT JOIN Base_Unit as unit on unit.UnitId=Project.UnitId "
+ @" LEFT JOIN Base_ProjectType AS ProjectType ON Project.ProjectType =ProjectType.ProjectTypeId"
+ @" LEFT JOIN Sys_Const AS sysConst ON Project.ProjectState2 =sysConst.ConstValue AND sysConst.GroupId= '" + BLL.ConstValue.GroupId_ProjectState + "' "
- + @" WHERE (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) and (Project.isDelete IS NULL OR Project.isDelete =0) ";
+ + @" WHERE (ProjectAttribute='GONGCHENG' OR ProjectAttribute IS NULL ) ";
List listStr = new List();
if (this.ckState.SelectedValue != "0")
diff --git a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
index 0a523a85..7106d883 100644
--- a/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/ProjectPerson.aspx
@@ -28,7 +28,7 @@
EnableEdit="true" OnSelectedIndexChanged="TextBox_TextChanged" AutoPostBack="true">
-
diff --git a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
index e26aaeab..3f85e96f 100644
--- a/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
+++ b/SGGL/FineUIPro.Web/DataShow/QualityAcceptance.aspx
@@ -13,7 +13,7 @@