1

SGGL/BLL/EnvironmentalCheckService.cs

@@ -12,8 +12,6 @@ namespace BLL
     /// </summary>
     public static class EnvironmentalCheckService
     {
-        public static Model.SGGLDB db = Funs.DB;
-
         #region 推送环境监测数据
 
         /// <summary>
@@ -22,6 +20,7 @@ namespace BLL
         /// <returns></returns>
         public static ReturnData PushEnvironmentalCheckData()
         {
+            var db = Funs.DB;
             var items = (from x in db.EnvironmentalCheck where x.IsPushed == false select x).ToList();
             Model.ReturnData responeData = new Model.ReturnData();
             if (items.Count() > 0)

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -649,7 +649,7 @@ namespace BLL
             var safeTrainBoShengTask = HSSEData_HSSEService.GetBoShengSafeTrainAsync();
             var specialTrainTask = HSSEData_HSSEService.GetSpecialTrainAsync();
             var specialOperationTrainTask = HSSEData_HSSEService.GetSpecialOperationTrainAsync();
-            var hseTechnicalNumTask = HSSEData_HSSEService.GetHseTechnicalNumAsync();
+            var hseTechnicalTask = HSSEData_HSSEService.GetHseTechnicalAsync();
             var headOfficeInspectorGeneralTask = HSSEData_HSSEService.GetHeadOfficeInspectorGeneralAsync();
             var headOfficeFullTimeTask = HSSEData_HSSEService.GetHeadOfficeFullTimeAsync();
             var branchInspectorGeneralTask = HSSEData_HSSEService.GetBranchInspectorGeneralAsync();
@@ -707,7 +707,7 @@ namespace BLL
                 safeWorkingHourTask,
                 safeTrainTask, safeTrainBoShengTask,
                 specialTrainTask,
-                specialOperationTrainTask, hseTechnicalNumTask,
+                specialOperationTrainTask, hseTechnicalTask,
                 headOfficeInspectorGeneralTask,
                 headOfficeFullTimeTask,
                 branchInspectorGeneralTask,
@@ -769,7 +769,7 @@ namespace BLL
             var safeTrainBoShengList = await safeTrainBoShengTask;
             var specialTrainList = await specialTrainTask;
             var specialOperationTrainList = await specialOperationTrainTask;
-            var hseTechnicalNum = await hseTechnicalNumTask;
+            var hseTechnicalList = await hseTechnicalTask;
             var headOfficeInspectorGeneralList = await headOfficeInspectorGeneralTask;
             var headOfficeFullTimeList = await headOfficeFullTimeTask;
             var branchInspectorGeneralList = await branchInspectorGeneralTask;
@@ -831,7 +831,7 @@ namespace BLL
                 SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Sum(x => x.TrainPersonNum),
                 SpecialTrainNum = specialTrainList.Sum(x => x.TrainPersonNum),
                 SpecialOperationTrainNum = specialOperationTrainList.Sum(x => x.TrainPersonNum),
-                HseTechnicalNum = hseTechnicalNum,
+                HseTechnicalNum = hseTechnicalList.Count(),
                 EnvironmentalTrainNum = 0,
                 TotalEnergyConsumption = totalEnergyConsumption,
                 IncomeComprehensiveEnergyConsumption = incomeComprehensiveEnergyConsumption,
@@ -964,7 +964,7 @@ namespace BLL
                     SafeTrainNum = safeTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     SpecialTrainNum = specialTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
                     SpecialOperationTrainNum = specialOperationTrainList.Where(x => x.ProjectId == projectid).Sum(x => x.TrainPersonNum),
-                    HseTechnicalNum = hseTechnicalNum,
+                    HseTechnicalNum = hseTechnicalList.Count(x => x.ProjectId == projectid),
                     EnvironmentalTrainNum = 0,
                     TotalEnergyConsumption = 0,
                     IncomeComprehensiveEnergyConsumption = 0,
@@ -2994,6 +2994,37 @@ namespace BLL
 
         }
 
+        /// <summary>
+        /// 获取安全技术交底
+        /// </summary>
+        /// <returns></returns>
+        public static List<LicenseHSETechnicalOutput> GetHseTechnical()
+        {
+            var result = (from x in Funs.DB.License_HSETechnical
+                        join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                        from p in pGroup.DefaultIfEmpty()
+                        where BeUnderConstructionList.Contains(x.ProjectId)
+                        select new Model.LicenseHSETechnicalOutput()
+                        {
+                            ProjectId = x.ProjectId,
+                            ProjectName = p.ProjectName,
+                            UnitName = UnitService.getUnitNamesUnitIds(x.UnitId),
+                            Id = x.HSETechnicalId,
+                            HSETechnicalCode = x.HSETechnicalCode,
+                            WorkContents = x.WorkContents
+                        }).ToList();
+            return result;
+        }
+
+        /// <summary>
+        ///     获取安全技术交底（异步）
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<LicenseHSETechnicalOutput>> GetHseTechnicalAsync()
+        {
+            return await Task.Run(GetHseTechnical);
+        }
+
         #endregion
 
 

SGGL/Model/Model.csproj

@@ -265,6 +265,7 @@
     <Compile Include="ZHGL\DataSync\HSSEDataItem.cs" />
     <Compile Include="ZHGL\DataSync\InspectionManagementOutput.cs" />
     <Compile Include="ZHGL\DataSync\LargeEngineeringOutput.cs" />
+    <Compile Include="ZHGL\DataSync\LicenseHSETechnicalOutput.cs" />
     <Compile Include="ZHGL\DataSync\LicenseOutput.cs" />
     <Compile Include="ZHGL\DataSync\MeetingOutput.cs" />
     <Compile Include="ZHGL\DataSync\OfSafetySupervisorsOutput.cs" />

SGGL/Model/ZHGL/DataSync/LicenseHSETechnicalOutput.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Model
+{
+    /// <summary>
+    /// 安全技术交底
+    /// </summary>
+    public class LicenseHSETechnicalOutput : BaseEntities
+    {
+        public string HSETechnicalCode { get; set; }
+        public string WorkContents { get; set; }
+        
+    }
+}