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/MdcEfficiencyReportServiceImpl.java | 47 +++++++++++++++++++++++------------------------ 1 files changed, 23 insertions(+), 24 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java index cd1ce79..c8dd286 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java @@ -100,15 +100,15 @@ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { result.setMdcEfficiencyList(listDtos); } else { - if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - List<String> equipmentList = mdcEquipmentService.listEquipmentId(vo.getEquipmentType(), vo.getEquipmentIdList()); - if (equipmentList != null && !equipmentList.isEmpty()) { - vo.setEquipmentIdList(equipmentList); - } else { - result.setMdcEfficiencyList(listDtos); - return result; - } + + List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo); + if (equipmentIdList != null && !equipmentIdList.isEmpty()) { + vo.setEquipmentIdList(equipmentIdList); + } else { + result.setMdcEfficiencyList(listDtos); + return result; } + // 鏌ヨ鍒╃敤鐜囨暟鎹� List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo); // 灏佽缁撴灉 @@ -448,14 +448,13 @@ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { result.setMdcEfficiencyList(listDtos); } else { - if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - List<String> equipmentList = mdcEquipmentService.listEquipmentId(vo.getEquipmentType(), vo.getEquipmentIdList()); - if (equipmentList != null && !equipmentList.isEmpty()) { - vo.setEquipmentIdList(equipmentList); - } else { - result.setMdcEfficiencyList(listDtos); - return result; - } + + List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo); + if (equipmentIdList != null && !equipmentIdList.isEmpty()) { + vo.setEquipmentIdList(equipmentIdList); + } else { + result.setMdcEfficiencyList(listDtos); + return result; } // 鏌ヨ鍒╃敤鐜囨暟鎹� List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyPOList(vo); @@ -797,16 +796,16 @@ if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { result.setMdcEfficiencyList(listDtos); } else { - if (StringUtils.isNotEmpty(vo.getEquipmentType())) { - List<String> equipmentList = mdcEquipmentService.listEquipmentId(vo.getEquipmentType(), vo.getEquipmentIdList()); - if (equipmentList != null && !equipmentList.isEmpty()) { - vo.setEquipmentIdList(equipmentList); - } else { - result.setMdcEfficiencyList(listDtos); - return result; - } + + List<String> equipmentIdList = mdcEquipmentService.listEquipmentIdShift(vo); + if (equipmentIdList != null && !equipmentIdList.isEmpty()) { + vo.setEquipmentIdList(equipmentIdList); + } else { + result.setMdcEfficiencyList(listDtos); + return result; } + // 鐝鍒╃敤鐜囨暟鎹� List<MdcEquipmentStatisticalShiftInfo> mdcEquipmentStatisticalShiftInfoList = mdcEfficiencyReportMapper.efficiencyShiftSumList(vo); -- Gitblit v1.9.3