提交代码

2024-04-22 11:21:48 +08:00
parent 4e9dddbaed
commit 7baffe5c70
3 changed files with 1444 additions and 1609 deletions
@@ -162,11 +162,12 @@ namespace FineUIPro.Web.common
            int result = 0;
            //机具报验的到期提醒和过期提醒记录数加一起
            //机具报验的到期提醒数
-            var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
-             && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
+            //var num1 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && DateTime.Now < x.NextTestDate
+            // && ((DateTime)x.NextTestDate).AddDays(-15) < DateTime.Now).Count();
            //过期提醒记录数
            var num2 = Funs.DB.Comprehensive_InspectionMachine.Where(x => x.IsOnSite == true && x.NextTestDate < DateTime.Now).Count();
-            result = num1 + num2;
+            //result = num1 + num2;
+            result =  num2;
            return result;
        }

@@ -200,9 +201,8 @@ namespace FineUIPro.Web.common
        private void getEarlyWarningCounts()
        {
            int allCount = 0;
-            var getPersonQualitys = from x in Funs.DB.QualityAudit_PersonQuality
-                                    join y in Funs.DB.SitePerson_Person on x.PersonId equals y.PersonId
-                                    where x.LimitDate.HasValue && x.LimitDate < DateTime.Now
+            var getPersonQualitys = from x in Funs.DB.Comprehensive_InspectionPerson
+                                    where x.ValidityDate.HasValue && x.ValidityDate < DateTime.Now && x.IsOnSite == true
                                    select x;
            //// 预警人数
            allCount = getPersonQualitys.Count();