diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java index 50d6f6e5..a69269aa 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/convert/packageData/PackageDataConvert.java @@ -57,13 +57,14 @@ public interface PackageDataConvert { groupedByFactoryIdAndDate.forEach((factoryId, dateMap) -> { - dateMap.forEach((date, infoList) -> { + dateMap.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) + .forEach((data) -> { PackagePageDataRespVO dataRespVO = new PackagePageDataRespVO(); dataRespVO.setFactoryId(factoryId); - dataRespVO.setFactoryName(infoList.get(0).getFactoryName()); - dataRespVO.setPackageDate(date.toString()); - dataRespVO.setPackageDataS(BeanUtils.toBean(infoList, PackageDataRespVO.class)); + dataRespVO.setFactoryName(data.getValue().get(0).getFactoryName()); + dataRespVO.setPackageDate(data.getKey().toString()); + dataRespVO.setPackageDataS(BeanUtils.toBean(data.getValue(), PackageDataRespVO.class)); pageDataRespVOS.add(dataRespVO); });