推送集团三级安全教育培训数据补充博晟培训入场培训

SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs

@@ -535,7 +535,7 @@ namespace BLL
                 TotalWorkingHour = GetTotalWorkingHour(),
                 LostWorkingHour = GetLostWorkingHour(),
                 SafeWorkingHour = GetSafeWorkingHour(),
-                SafeTrainNum = GetSafeTrain().Sum(x => x.TrainPersonNum),
+                SafeTrainNum = GetSafeTrain().Sum(x => x.TrainPersonNum) + GetBoShengSafeTrain().Sum(x => x.TrainPersonNum),
                 SpecialTrainNum = GetSpecialTrain().Sum(x => x.TrainPersonNum),
                 SpecialOperationTrainNum = GetSpecialOperationTrain().Sum(x => x.TrainPersonNum),
                 EnvironmentalTrainNum = 0,
@@ -646,6 +646,7 @@ namespace BLL
             var lostWorkingHourTask = HSSEData_HSSEService.GetLostWorkingHourAsync();
             var safeWorkingHourTask = HSSEData_HSSEService.GetSafeWorkingHourAsync();
             var safeTrainTask = HSSEData_HSSEService.GetSafeTrainAsync();
+            var safeTrainBoShengTask = HSSEData_HSSEService.GetBoShengSafeTrainAsync();
             var specialTrainTask = HSSEData_HSSEService.GetSpecialTrainAsync();
             var specialOperationTrainTask = HSSEData_HSSEService.GetSpecialOperationTrainAsync();
             var hseTechnicalNumTask = HSSEData_HSSEService.GetHseTechnicalNumAsync();
@@ -704,7 +705,7 @@ namespace BLL
                 totalWorkingHourTask,
                 lostWorkingHourTask,
                 safeWorkingHourTask,
-                safeTrainTask,
+                safeTrainTask, safeTrainBoShengTask,
                 specialTrainTask,
                 specialOperationTrainTask, hseTechnicalNumTask,
                 headOfficeInspectorGeneralTask,
@@ -765,6 +766,7 @@ namespace BLL
             var lostWorkingHour = await lostWorkingHourTask;
             var safeWorkingHour = await safeWorkingHourTask;
             var safeTrainList = await safeTrainTask;
+            var safeTrainBoShengList = await safeTrainBoShengTask;
             var specialTrainList = await specialTrainTask;
             var specialOperationTrainList = await specialOperationTrainTask;
             var hseTechnicalNum = await hseTechnicalNumTask;
@@ -826,7 +828,7 @@ namespace BLL
                 TotalWorkingHour = totalWorkingHour,
                 LostWorkingHour = lostWorkingHour,
                 SafeWorkingHour = safeWorkingHour,
-                SafeTrainNum = safeTrainList.Sum(x => x.TrainPersonNum),
+                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,
@@ -2869,6 +2871,39 @@ namespace BLL
             return await Task.Run(GetSafeTrain);
         }
 
+        /// <summary>
+        ///     获取三级安全教育培训数——博晟培训
+        /// </summary>
+        /// <returns></returns>
+        public static List<EduTrainOutput> GetBoShengSafeTrain()
+        {
+            var result = (from x in Funs.DB.Bo_Sheng_Train
+                          join p in Funs.DB.Base_Project on x.ProjectId equals p.ProjectId into pGroup
+                          from p in pGroup.DefaultIfEmpty()
+                          where BeUnderConstructionList.Contains(p.ProjectId) && (x.TrainType == "入场（厂）培训" || x.TrainType == "入厂（场）级培训")
+                                && (x.DeleteTag == "False" || x.DeleteTag == null) && x.TrainStartDate > Const.DtmarkTime
+                          select new Model.EduTrainOutput()
+                          {
+                              Id = x.ID,
+                              ProjectId = x.ProjectId,
+                              ProjectName = p.ProjectName,
+                              UnitName = x.TrainDepart,
+                              TrainTitle = x.RecordName,
+                              TrainStartDate = x.TrainStartDate,
+                              TrainEndDate = x.TrainEndDate,
+                              TrainPersonNum = x.PersonCount ?? 0,
+                          }).ToList();
+            return result;
+        }
+        /// <summary>
+        ///     获取三级安全教育培训数——博晟培训（异步）
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<EduTrainOutput>> GetBoShengSafeTrainAsync()
+        {
+            return await Task.Run(GetBoShengSafeTrain);
+        }
+
         /// <summary>
         ///     获取专项培训数
         /// </summary>

SGGL/BLL/ZHGL/DataSync/MainSevice.cs

@@ -4,7 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace BLL { 
+namespace BLL
+{
 
     public class MainSevice
     {
@@ -65,6 +66,7 @@ public class MainSevice
                 var lostWorkingHourTask = HSSEData_HSSEService.GetLostWorkingHourAsync();
                 var safeWorkingHourTask = HSSEData_HSSEService.GetSafeWorkingHourAsync();
                 var safeTrainTask = HSSEData_HSSEService.GetSafeTrainAsync();
+                var safeTrainBoShengTask = HSSEData_HSSEService.GetBoShengSafeTrainAsync();
                 var specialTrainTask = HSSEData_HSSEService.GetSpecialTrainAsync();
                 var specialOperationTrainTask = HSSEData_HSSEService.GetSpecialOperationTrainAsync();
                 var headOfficeInspectorGeneralTask = HSSEData_HSSEService.GetHeadOfficeInspectorGeneralAsync();
@@ -123,6 +125,7 @@ public class MainSevice
                     lostWorkingHourTask,
                     safeWorkingHourTask,
                     safeTrainTask,
+                    safeTrainBoShengTask,
                     specialTrainTask,
                     specialOperationTrainTask,
                     headOfficeInspectorGeneralTask,
@@ -183,6 +186,7 @@ public class MainSevice
                 var lostWorkingHour = await lostWorkingHourTask;
                 var safeWorkingHour = await safeWorkingHourTask;
                 var safeTrainList = await safeTrainTask;
+                var safeTrainBoShengList = await safeTrainBoShengTask;
                 var specialTrainList = await specialTrainTask;
                 var specialOperationTrainList = await specialOperationTrainTask;
                 var headOfficeInspectorGeneralList = await headOfficeInspectorGeneralTask;
@@ -233,7 +237,7 @@ public class MainSevice
                     TotalWorkingHour = totalWorkingHour,
                     LostWorkingHour = lostWorkingHour,
                     SafeWorkingHour = safeWorkingHour,
-            SafeTrainNum = safeTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum),
+                    SafeTrainNum = safeTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) + safeTrainBoShengList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum),
                     SpecialTrainNum = specialTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum),
                     SpecialOperationTrainNum = specialOperationTrainList.Where(x => _beUnderConstructionList.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum),
                     EnvironmentalTrainNum = 0,
@@ -357,4 +361,5 @@ public class MainSevice
                           }).ToList();
             return result;
         }
-} }
+    }
+}