专项检查

2025-04-15 20:48:53 +08:00
parent 80ea8ec450
commit 1c6dca4612
36 changed files with 29955 additions and 932 deletions
@@ -157,9 +157,7 @@ namespace BLL
            {
                DateTime mdate = Funs.GetNewDateTimeOrNow(date);
                var hazardRegisters = (from x in db.HSSE_Hazard_HazardRegister
-                                       //join y in db.Base_Project on x.ProjectId equals projectId
-                                       where x.ProjectId == projectId 
-                                       && x.CheckTime.Value.Year == mdate.Year 
+                                       where x.CheckTime.Value.Year == mdate.Year
                                       && x.CheckTime.Value.Month == mdate.Month
                                       && x.CheckTime.Value.Day == mdate.Day
                                       select new Model.HazardRegisterItem
@@ -181,6 +179,10 @@ namespace BLL
                                           Risk_Level = x.Risk_Level,

                                       }).OrderBy(x => x.CheckTime).ToList();
+                if (String.IsNullOrEmpty(projectId))
+                {
+                    hazardRegisters.Where(p => p.ProjectId == projectId); 
+                }
                return hazardRegisters;
            }
        }