From 7f5f987eed2df614c8e40fe4a71746c047d57231 Mon Sep 17 00:00:00 2001
From: xiaju <1784803958@qq.com>
Date: Wed, 9 Jul 2025 11:14:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E4=BA=BA=E5=91=98=E6=8A=A5?=
 =?UTF-8?q?=E9=AA=8C=E6=80=BB=E6=95=B0=E5=8F=96=E5=9C=A8=E5=9C=BA=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=90=88=E6=A0=BC=E4=BA=BA=E6=95=B0=E5=8F=96?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=E5=86=85=E7=9A=84=E5=9C=A8=E5=9C=BA?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DataBase/版本日志/SGGLDB_WH_2025-07-04.sql | 3 +++
 SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs  | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 DataBase/版本日志/SGGLDB_WH_2025-07-04.sql

diff --git a/DataBase/版本日志/SGGLDB_WH_2025-07-04.sql b/DataBase/版本日志/SGGLDB_WH_2025-07-04.sql
new file mode 100644
index 00000000..0bc09c72
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2025-07-04.sql
@@ -0,0 +1,3 @@
+
+
+ALTER TABLE License_EquipmentSafetyList DROP CONSTRAINT [FK_License_EquipmentSafetyList_ProjectData_WorkArea];
\ No newline at end of file
diff --git a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
index 4104abfb..e9dd1578 100644
--- a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
@@ -688,7 +688,7 @@ namespace BLL
                 EquipmentInspectionNum = inspectionEquipmentList.Count(),
                 EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
                 PersonInspectionNum = inspectionPersonList.Count(),
-                PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true).Count(),
+                PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)).Count(),
                 MachineInspectionNum = inspectionMachineList.Count(),
                 MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
                 InspectionMachineNum = inspectionMachineEquipmentList.Count(),
@@ -1167,13 +1167,13 @@ namespace BLL
         }
 
         /// <summary>
-        /// 获取人员报验
+        /// 获取人员报验（总数取在场人员）
         /// </summary>
         /// <returns></returns>
         public static List<Model.Comprehensive_InspectionPerson> GetComprehensive_InspectionPerson()
         {
             var result = (from x in Funs.DB.Comprehensive_InspectionPerson
-                          where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime
+                          where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite.HasValue && x.IsOnSite == true && x.CompileDate > Const.DtmarkTime
                           select x).ToList();
             return result;
         }