From 97b236d21dfbadc9c5a1fa88e097fe3682135f18 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Wed, 4 Sep 2024 11:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj     |  2 +-
 SGGL/FineUIPro.Web/common/main_new0.aspx.cs | 50 ++++++++++++++-------
 2 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index 29220861..fec7f569 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19232,7 +19232,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
index d6d2bf81..d05b42a8 100644
--- a/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new0.aspx.cs
@@ -189,9 +189,9 @@ namespace FineUIPro.Web.common
                     //一般
                     allYhYb += "'" +
                     ((from x in hazardRegisters
-                     where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States == "3" &&
-                           x.CheckTime > Const.DtmarkTime
-                     select x).Count() +
+                      where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States == "3" &&
+                            x.CheckTime > Const.DtmarkTime
+                      select x).Count() +
                     (from x in hazardRegisters
                      where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States != "3" &&
                            x.CheckTime > Const.DtmarkTime
@@ -546,7 +546,11 @@ namespace FineUIPro.Web.common
             var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
                           join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
                           where y.EmergencyTypeName.Contains("综合") && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
+                          select x).Count() +
+                          (from x in Funs.DB.Emergency_EmergencyList
+                           join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                           where y.EmergencyTypeName.Contains("综合") && x.CompileDate > Const.DtmarkTime
+                           select x).Count();
             return result;
         }
 
@@ -559,7 +563,11 @@ namespace FineUIPro.Web.common
             var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
                           join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
                           where y.EmergencyTypeName.Contains("专项") && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
+                          select x).Count() +
+                          (from x in Funs.DB.Emergency_EmergencyList
+                           join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                           where y.EmergencyTypeName.Contains("专项") && x.CompileDate > Const.DtmarkTime
+                           select x).Count();
             return result;
         }
 
@@ -572,7 +580,11 @@ namespace FineUIPro.Web.common
             var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
                           join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
                           where y.EmergencyTypeName.Contains("现场处置") && x.CompileDate > Const.DtmarkTime
-                          select x).Count();
+                          select x).Count() +
+                          (from x in Funs.DB.Emergency_EmergencyList
+                           join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
+                           where y.EmergencyTypeName.Contains("现场处置") && x.CompileDate > Const.DtmarkTime
+                           select x).Count();
             return result;
         }
 
@@ -584,7 +596,10 @@ namespace FineUIPro.Web.common
         {
             var result = (from x in Funs.DB.Emergency_DrillRecordList_Unit
                           where x.CompileDate > Const.DtmarkTime
-                          select x).Count();
+                          select x).Count() +
+                          (from x in Funs.DB.Emergency_DrillRecordList
+                           where x.CompileDate > Const.DtmarkTime
+                           select x).Count();
             return result;
         }
         #endregion
@@ -596,9 +611,10 @@ namespace FineUIPro.Web.common
         /// <returns></returns>
         public static int GetSafeTrainNum()
         {
-            var result = (from x in Funs.DB.EduTrain_TrainRecord
-                          join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
-                          where y.TrainType == "1" && x.TrainStartDate > Const.DtmarkTime
+            var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                          join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                          join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                          where y.TrainType == "1"
                           select x).Count();
             return result;
         }
@@ -609,9 +625,10 @@ namespace FineUIPro.Web.common
         /// <returns></returns>
         public static int GetSpecialTrainNum()
         {
-            var result = (from x in Funs.DB.EduTrain_TrainRecord
-                          join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
-                          where y.TrainType == "2" && x.TrainStartDate > Const.DtmarkTime
+            var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                          join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                          join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                          where y.TrainType == "2"
                           select x).Count();
             return result;
         }
@@ -622,9 +639,10 @@ namespace FineUIPro.Web.common
         /// <returns></returns>
         public static int GetSpecialOperationTrainNum()
         {
-            var result = (from x in Funs.DB.EduTrain_TrainRecord
-                          join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId
-                          where y.TrainType == "3" && x.TrainStartDate > Const.DtmarkTime
+            var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
+                          join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
+                          join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
+                          where y.TrainType == "3"
                           select x).Count();
             return result;
         }