From 7cb124e47f32af99c1098db89462f549a395254b Mon Sep 17 00:00:00 2001 From: Lius <Lius2225@163.com> Date: 星期三, 24 四月 2024 14:26:17 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java index 588b583..b9a7384 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java @@ -375,6 +375,9 @@ ControlSystem controlSystem = controlSystemService.getByDriveType(mdcEquipmentDto.getDriveType()); // 鏌ヨ璁惧鐘舵�� EquipmentLog equipmentLog = equipmentLogService.selectEquipmentOporation(mdcEquipment.getEquipmentId()); + if (equipmentLog == null) { + return mdcEquipmentDto; + } Integer oporation = equipmentLog.getOporation(); if (controlSystem != null) { @@ -721,8 +724,25 @@ } @Override - public List<String> listEquipmentId(String equipmentType, List<String> equipmentIdList) { - List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList)); + public List<String> listEquipmentId(MdcEfficiencyReportQueryVo vo) { + LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>(); + if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) { + queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()); + } + if (StringUtils.isNotEmpty(vo.getEquipmentType())) { + queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceLevel())) { + queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel()); + } + if (StringUtils.isNotEmpty(vo.getDriveType())) { + queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceCategory())) { + queryWrapper.eq(MdcEquipment::getDeviceCategory, vo.getDeviceCategory()); + } + List<MdcEquipment> list = super.list(queryWrapper); +// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList)); return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList()); } @@ -853,4 +873,27 @@ } } + @Override + public List<String> listEquipmentIdShift(MdcEfficiencyReportShiftQueryVo vo) { + LambdaQueryWrapper<MdcEquipment> queryWrapper = new LambdaQueryWrapper<>(); + if (vo.getEquipmentIdList() != null && !vo.getEquipmentIdList().isEmpty()) { + queryWrapper.in(MdcEquipment::getEquipmentId, vo.getEquipmentIdList()); + } + if (StringUtils.isNotEmpty(vo.getEquipmentType())) { + queryWrapper.eq(MdcEquipment::getEquipmentType, vo.getEquipmentType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceLevel())) { + queryWrapper.eq(MdcEquipment::getDeviceLevel, vo.getDeviceLevel()); + } + if (StringUtils.isNotEmpty(vo.getDriveType())) { + queryWrapper.eq(MdcEquipment::getDriveType, vo.getDriveType()); + } + if (StringUtils.isNotEmpty(vo.getDeviceCategory())) { + queryWrapper.eq(MdcEquipment::getDeviceCategory, vo.getDeviceCategory()); + } + List<MdcEquipment> list = super.list(queryWrapper); +// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList)); + return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList()); + } + } -- Gitblit v1.9.3