From e5a8de3b7ced0300bf7b7e5a3bc5b615fb4e53f2 Mon Sep 17 00:00:00 2001 From: yangman <15045099937@qq.com> Date: 星期一, 03 七月 2023 13:36:31 +0800 Subject: [PATCH] 修改扭矩配置管理 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 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 c0857ab..13d6e58 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 @@ -72,7 +72,9 @@ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null); } } - vo.setEquipmentIdList(equipmentIds); + if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) { + vo.setEquipmentIdList(equipmentIds); + } // 鏌ヨ鍒╃敤鐜囨暟鎹� List<MdcEfficiencyDto> efficiencyList = mdcEfficiencyReportMapper.efficiencyList(vo); @@ -93,16 +95,21 @@ for (String date : dates) { list.add(this.efficiencyRate(efficiencyList, date, mdcEquipment, mdcUtilizationRateList)); } - mdcEfficiencyListDto.setList(list); + mdcEfficiencyListDto.setDataList(list); listDtos.add(mdcEfficiencyListDto); } - result.setLists(listDtos); + result.setMdcEfficiencyList(listDtos); result.setDates(dates); return result; } + @Override + public MdcEfficiencyVo shiftEfficiencyList(String userId, MdcEfficiencyReportQueryVo vo) { + return null; + } + private MdcEfficiencyResultDto efficiencyRate(List<MdcEfficiencyDto> efficiencyList, String date, MdcEquipment mdcEquipment, List<MdcUtilizationRate> mdcUtilizationRateList) { MdcEfficiencyResultDto mdcEfficiencyResultDto = new MdcEfficiencyResultDto(); if (efficiencyList != null && !efficiencyList.isEmpty()) { -- Gitblit v1.9.3