diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index 2e230a2e..e145bfef 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -625,12 +625,12 @@ public enum StaticIndexEnum { int dfCount = dfQxService.count(new LambdaQueryWrapper() .eq(DfCheckingProblemV2::getProblemLevel, dj) .ge(!Objects.isNull(sp.getStartTime()), DfCheckingProblemV2::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getStartTime()), DfCheckingProblemV2::getCreateTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getStartTime()), DfCheckingProblemV2::getCreateTime, sp.getEndTime()) ); int szCount = szQxService.count(new LambdaQueryWrapper() .eq(SzCheckingProblemV2::getProblemLevel, dj) .ge(!Objects.isNull(sp.getStartTime()), SzCheckingProblemV2::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getStartTime()), SzCheckingProblemV2::getCreateTime, sp.getStartTime()) + .le(!Objects.isNull(sp.getStartTime()), SzCheckingProblemV2::getCreateTime, sp.getEndTime()) ); return dfCount+szCount; } @@ -640,10 +640,10 @@ public enum StaticIndexEnum { SzYhV2Service szYhV2Service = SpringUtils.getBean(SzYhV2Service.class); int dfCount = dfYhV2Service.count(new LambdaQueryWrapper() .ge(!Objects.isNull(sp.getStartTime()), DfYhV2::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getStartTime()), DfYhV2::getCreateTime, sp.getStartTime())); + .le(!Objects.isNull(sp.getStartTime()), DfYhV2::getCreateTime, sp.getEndTime())); int szCount = szYhV2Service.count(new LambdaQueryWrapper() .ge(!Objects.isNull(sp.getStartTime()), SzYhV2::getCreateTime, sp.getStartTime()) - .le(!Objects.isNull(sp.getStartTime()), SzYhV2::getCreateTime, sp.getStartTime())); + .le(!Objects.isNull(sp.getStartTime()), SzYhV2::getCreateTime, sp.getEndTime())); int yb = getProblemGrade(PatrolMaintenanceCategory.DJ_YB.getValue(), sp); int jd = getProblemGrade(PatrolMaintenanceCategory.DJ_JD.getValue(), sp);