提交代码

DataBase/版本日志/SGGLDB_V2024-08-05.sql

@@ -0,0 +1,13 @@
+INSERT INTO [dbo].[Sys_Menu] ([MenuId], [MenuName], [Icon], [Url], [SortIndex], [SuperMenu], [MenuType], [IsOffice], [IsEnd], [IsUsed]) VALUES 
+(N'81735D5D-712D-4D90-A471-5E0CCE98EF48', N'施工作业风险(地图)', NULL, N'HSSE/Hazard/ConstructionRiskMap.aspx', '120', N'467A0CB9-737D-4451-965E-869EBC3A4BD6', N'Menu_HSSE', '1', '1', '1')
+GO
+
+Alter TABLE [dbo].[WBS_UnitWork] add
+	[Coordinate] [nvarchar](100) NULL 
+GO
+	
+
+
+	Alter TABLE [dbo].[HSSE_ConstructionRisk] add
+	[Coordinate] [nvarchar](100) NULL 
+GO

SGGL/BLL/API/APIPersonService.cs

@@ -1,5 +1,4 @@
-using Microsoft.SqlServer.Dts.Runtime;
-using Model;
+using Model;
 using NPOI.SS.Formula.PTG;
 using System;
 using System.Collections.Generic;

SGGL/BLL/BLL.csproj

@@ -463,9 +463,9 @@
     <Compile Include="HSSE\Environmental\EnvironmentalEmergencyPlanService.cs" />
     <Compile Include="HSSE\Environmental\EnvironmentalMonitoringService.cs" />
     <Compile Include="HSSE\Environmental\UnexpectedEnvironmentalService.cs" />
-    <Compile Include="HSSE\Hazard\ConstructionRiskListService.cs" />
     <Compile Include="HSSE\Hazard\Hazard_EnvironmentalRiskItemService.cs" />
     <Compile Include="HSSE\Hazard\Hazard_EnvironmentalRiskListService.cs" />
+    <Compile Include="HSSE\Hazard\ConstructionRiskListService.cs" />
     <Compile Include="HSSE\Hazard\Hazard_HazardListService.cs" />
     <Compile Include="HSSE\Hazard\Hazard_HazardSelectedItemService.cs" />
     <Compile Include="HSSE\HiddenInspection\HSSE_Hazard_HazardRegisterService.cs" />

SGGL/BLL/DigData/WBSAnalysisService.cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using NPOI.SS.Formula.Functions;
 using Org.BouncyCastle.Crypto.Tls;
 using System;

SGGL/BLL/HJGL/PointTrust/PointBatchService.cs

@@ -1,5 +1,4 @@
-using Microsoft.SqlServer.Dts.Runtime;
-using NPOI.SS.Formula.Functions;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Data;

SGGL/BLL/HJGL/WeldingManage/PipelineService.cs

@@ -1,5 +1,4 @@
 using Microsoft.Office.Interop.Word;
-using Microsoft.SqlServer.Dts.Runtime;
 using MiniExcelLibs;
 using Model;
 using System;

SGGL/BLL/HSSE/CostGoods/CostManageService.cs

@@ -1,5 +1,4 @@
-using Microsoft.SqlServer.Dts.Runtime;
-using Model;
+using Model;
 using NPOI.SS.UserModel;
 using System;
 using System.Collections.Generic;

SGGL/BLL/HSSE/Hazard/ConstructionRiskListService.cs

@@ -19,9 +19,9 @@ namespace BLL
             return Funs.DB.HSSE_ConstructionRisk.FirstOrDefault(e => e.ConstructionRiskId == constructionRiskId);
         }
 
-        
 
-     
+
+
 
         /// <summary>
         /// 
@@ -44,12 +44,13 @@ namespace BLL
                 LicenseDes = constructionRisk.LicenseDes,
                 WorkAreaId = constructionRisk.WorkAreaId,
                 UnitId = constructionRisk.UnitId,
-                RiskLevel = constructionRisk.RiskLevel
+                RiskLevel = constructionRisk.RiskLevel,
+                Coordinate = constructionRisk.Coordinate,
             };
             Funs.DB.HSSE_ConstructionRisk.InsertOnSubmit(newconstructionRisk);
             Funs.DB.SubmitChanges();
-           
-         }
+
+        }
 
         public static void AddConstructionRiskControl(Model.HSSE_ConstructionRiskControl constructionRiskControl)
         {
@@ -86,12 +87,12 @@ namespace BLL
 
             Funs.DB.SubmitChanges();
         }
-        public static void AddConstructionRiskControl(List<Model.HSSE_ConstructionRiskControl > constructionRisk,string constructionRiskId)
+        public static void AddConstructionRiskControl(List<Model.HSSE_ConstructionRiskControl> constructionRisk, string constructionRiskId)
         {
             Model.SGGLDB db = Funs.DB;
             int i = 1;
 
-           var cons = Funs.DB.HSSE_ConstructionRiskControl.Where(x => x.ConstructionRiskId == constructionRiskId);
+            var cons = Funs.DB.HSSE_ConstructionRiskControl.Where(x => x.ConstructionRiskId == constructionRiskId);
             if (cons.Count() > 0)
             {
                 Funs.DB.HSSE_ConstructionRiskControl.DeleteAllOnSubmit(cons);
@@ -105,7 +106,7 @@ namespace BLL
                     Measures = item.Measures,
                     CheckResult = item.CheckResult,
                     CheckMan = item.CheckMan,
-                    Rectification = item.Rectification, 
+                    Rectification = item.Rectification,
                     ShowIndex = i++,
                 };
                 Funs.DB.HSSE_ConstructionRiskControl.InsertOnSubmit(newconstructionRisk);
@@ -134,6 +135,7 @@ namespace BLL
                 newHazardList.WorkAreaId = hazardList.WorkAreaId;
                 newHazardList.UnitId = hazardList.UnitId;
                 newHazardList.RiskLevel = hazardList.RiskLevel;
+                newHazardList.Coordinate = hazardList.Coordinate;
                 db.SubmitChanges();
             }
             else
@@ -152,7 +154,7 @@ namespace BLL
             Model.HSSE_ConstructionRisk hazardList = db.HSSE_ConstructionRisk.FirstOrDefault(e => e.ConstructionRiskId == constructionRiskId);
             if (hazardList != null)
             {
-                
+
                 var constructionRiskControls = db.HSSE_ConstructionRiskControl.Where(e => e.ConstructionRiskId == constructionRiskId);
                 if (constructionRiskControls.Count() > 0)
                 {
@@ -162,6 +164,6 @@ namespace BLL
                 db.SubmitChanges();
             }
         }
- 
+
     }
 }

SGGL/BLL/HSSE/SitePerson/SitePerson_PersonItemService.cs

@@ -1,6 +1,5 @@
 using FineUIPro;
 using Microsoft.Office.Interop.Excel;
-using Microsoft.SqlServer.Dts.Runtime;
 using Model;
 using System;
 using System.Collections;

SGGL/BLL/HSSE/SitePerson/SitePerson_PersonService.cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using Model;
 using NPOI.HSSF.Record.Aggregates;
 using NPOI.SS.Formula.PTG;

SGGL/BLL/Person/Person_PersonContractService.cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using System;
 using System.Collections;
 using System.Linq;

SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HiddenDangerDetailService.cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using Model;
 using System;
 using System.Collections;

SGGL/BLL/ZHGL/Environmental/ProjectEnergyReportService.cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using System;
 using System.Collections;
 using System.Collections.Generic;

SGGL/BLL/ZHGL/Environmental/ProjectEnergyreportItemService .cs

@@ -1,5 +1,4 @@
 using FineUIPro;
-using Microsoft.SqlServer.Dts.Runtime;
 using System;
 using System.Collections;
 using System.Collections.Generic;