diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java index 46ff89d2..a0dcf41a 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/service/impl/DpzaglServiceImpl.java @@ -186,7 +186,7 @@ public class DpzaglServiceImpl implements DpzaglService { // req.setStatus(DpEnum.ZLGDZT_ZG.getTypeValue()); // TableDataInfo aqZgList = safetyInspectionService.queryPageList(req, pageQuery); // 安全总数(用于判断巡检类型) - List list = safetyInspectionService.list(new LambdaQueryWrapper().ge(bo.getStartDate() != null ,HseSafetyInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,HseSafetyInspection::getCreateTime, bo.getEndDate())); + List list = safetyInspectionService.list(new LambdaQueryWrapper().eq(HseSafetyInspection::getProjectId, bo.getProjectId()).ge(bo.getStartDate() != null ,HseSafetyInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,HseSafetyInspection::getCreateTime, bo.getEndDate())); // List rows = anList.getRows(); @@ -222,7 +222,7 @@ public class DpzaglServiceImpl implements DpzaglService { // TableDataInfo zlZgLists = qualityInspectionService.queryPageList(req, pageQuery); // 质量总数 List zsZl = qualityInspectionService.getBaseMapper() - .selectList(new LambdaQueryWrapper() + .selectList(new LambdaQueryWrapper().eq(QltQualityInspection::getProjectId, bo.getProjectId()) .ge(bo.getStartDate() != null ,QltQualityInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,QltQualityInspection::getCreateTime, bo.getEndDate()));