From eaeb1e014d86a2949377465c927f2c794123d11a Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Thu, 23 May 2024 15:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=89=93=E5=8C=85?= =?UTF-8?q?=E7=BA=BF=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=20=E6=8C=89?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=97=A5=E6=9C=9F=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../convert/packageData/PackageDataConvert.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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); });