质安管理增加项目判断
This commit is contained in:
@ -186,7 +186,7 @@ public class DpzaglServiceImpl implements DpzaglService {
|
|||||||
// req.setStatus(DpEnum.ZLGDZT_ZG.getTypeValue());
|
// req.setStatus(DpEnum.ZLGDZT_ZG.getTypeValue());
|
||||||
// TableDataInfo<HseSafetyInspectionVo> aqZgList = safetyInspectionService.queryPageList(req, pageQuery);
|
// TableDataInfo<HseSafetyInspectionVo> aqZgList = safetyInspectionService.queryPageList(req, pageQuery);
|
||||||
// 安全总数(用于判断巡检类型)
|
// 安全总数(用于判断巡检类型)
|
||||||
List<HseSafetyInspection> list = safetyInspectionService.list(new LambdaQueryWrapper<HseSafetyInspection>().ge(bo.getStartDate() != null ,HseSafetyInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,HseSafetyInspection::getCreateTime, bo.getEndDate()));
|
List<HseSafetyInspection> list = safetyInspectionService.list(new LambdaQueryWrapper<HseSafetyInspection>().eq(HseSafetyInspection::getProjectId, bo.getProjectId()).ge(bo.getStartDate() != null ,HseSafetyInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,HseSafetyInspection::getCreateTime, bo.getEndDate()));
|
||||||
|
|
||||||
// List<HseSafetyInspectionVo> rows = anList.getRows();
|
// List<HseSafetyInspectionVo> rows = anList.getRows();
|
||||||
|
|
||||||
@ -222,7 +222,7 @@ public class DpzaglServiceImpl implements DpzaglService {
|
|||||||
// TableDataInfo<QltQualityInspectionVo> zlZgLists = qualityInspectionService.queryPageList(req, pageQuery);
|
// TableDataInfo<QltQualityInspectionVo> zlZgLists = qualityInspectionService.queryPageList(req, pageQuery);
|
||||||
// 质量总数
|
// 质量总数
|
||||||
List<QltQualityInspection> zsZl = qualityInspectionService.getBaseMapper()
|
List<QltQualityInspection> zsZl = qualityInspectionService.getBaseMapper()
|
||||||
.selectList(new LambdaQueryWrapper<QltQualityInspection>()
|
.selectList(new LambdaQueryWrapper<QltQualityInspection>().eq(QltQualityInspection::getProjectId, bo.getProjectId())
|
||||||
.ge(bo.getStartDate() != null ,QltQualityInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,QltQualityInspection::getCreateTime, bo.getEndDate()));
|
.ge(bo.getStartDate() != null ,QltQualityInspection::getCreateTime, bo.getStartDate()).le(bo.getEndDate() != null ,QltQualityInspection::getCreateTime, bo.getEndDate()));
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user