Lius
2024-10-12 0aa00cd0593e363a88c152ce07734dd738513603
update
已修改2个文件
18 ■■■■ 文件已修改
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
@@ -123,8 +123,8 @@
                EquipmentRateDto equipmentRateDto = new EquipmentRateDto();
                equipmentRateDto.setEquipmentId(mdcEfficiencyDto.getEquipmentId());
                equipmentRateDto.setEquipmentName(mdcEfficiencyDto.getEquipmentName());
                equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate());
                equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate());
                equipmentRateDto.setOpenRate(mdcEfficiencyDto.getOpenRate().setScale(2, RoundingMode.HALF_UP));
                equipmentRateDto.setUtilizationRate(mdcEfficiencyDto.getUtilizationRate().setScale(2, RoundingMode.HALF_UP));
                result.add(equipmentRateDto);
            }
        }
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcSubLargeScreenServiceImpl.java
@@ -111,12 +111,12 @@
     */
    @Override
    public List<ToolLifeDto> toolLifeList(String productionId) {
        List<ToolLifeDto> toolLifeList = mdcSubLargeScreenMapper.toolLifeList(productionId);
        if (toolLifeList != null && !toolLifeList.isEmpty()) {
            for (ToolLifeDto toolLifeDto : toolLifeList) {
                toolLifeDto.setTId("T" + toolLifeDto.getTId());
            }
        }
        return toolLifeList;
//        List<ToolLifeDto> toolLifeList = mdcSubLargeScreenMapper.toolLifeList(productionId);
//        if (toolLifeList != null && !toolLifeList.isEmpty()) {
//            for (ToolLifeDto toolLifeDto : toolLifeList) {
//                toolLifeDto.setTId("T" + toolLifeDto.getTId());
//            }
//        }
        return mdcSubLargeScreenMapper.toolLifeList(productionId);
    }
}