修改共检统计

2023-09-01 17:11:53 +08:00
parent cfd069933e
commit 9305995a9e
2 changed files with 6 additions and 6 deletions
@@ -249,13 +249,13 @@ namespace FineUIPro.Web.ZHGL.InspectionSummary
            //一次共检合格数
            var list20 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                          join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                          where y.IsOnceQualified == true
-                          select new {  y.ProjectId,y.InspectionDate }).ToList();
+                          where y.IsOnceQualified == true && y.InspectionDate != null
+                          select new {  y.ProjectId,y.InspectionDate,y.IsOnceQualified,x.InspectionId, Isid= y.InspectionId }).ToList();
            ////总数
            var list21 = (from x in Funs.DB.ProcessControl_InspectionManagementDetail
                          join y in Funs.DB.ProcessControl_InspectionManagement on x.InspectionId equals y.InspectionId
-                          
-                          select new {  y.ProjectId}).ToList();
+                          where y.InspectionDate != null
+                          select new {  y.ProjectId, x.InspectionId, Isid = y.InspectionId,y.InspectionDate }).ToList();

            //关键事项
            var list22 = (from x in Funs.DB.GJSX