diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java index f2be7b298..7989e2d76 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/LineWarningServiceImpl.java @@ -942,7 +942,8 @@ public class LineWarningServiceImpl extends MppServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(WarningLeaflet::getState, 1) .eq(WarningLeaflet::getProblemType, 2) - .between(WarningLeaflet::getCreateTime, firstDayOfYear, lastDayOfYear); + .like(WarningLeaflet::getFilePath,year); +// .between(WarningLeaflet::getCreateTime, firstDayOfYear, lastDayOfYear); List list = warningLeafletService.list(lambdaQueryWrapper); if (list.isEmpty()) { return "1"; @@ -961,6 +962,18 @@ public class LineWarningServiceImpl extends MppServiceImpl