diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java index 0fa347f0a..b71788697 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/funds/purchase/PurchaseServiceImpl.java @@ -45,6 +45,7 @@ import java.math.BigDecimal; import java.math.RoundingMode; import java.time.LocalDate; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Optional; @@ -348,7 +349,7 @@ public class PurchaseServiceImpl implements PurchaseService { BigDecimal totalAmount = orgInitialPurchaseRecord.getTotalAmount(); // 定价中有的,以年数量*组织定价*折扣展示 List productDetailRespVOList = new ArrayList<>(); - for (ProductsDetailDO detailDO : page.getList()) { + for (ProductsDetailDO detailDO : page.getList().stream().sorted(Comparator.comparingInt(ProductsDetailDO::getDuration)).collect(Collectors.toList())) { ProductDetailsRespVO newDetailRespVO = BeanUtils.toBean(detailDO, ProductDetailsRespVO.class); // 折扣 BigDecimal discount = detailDO.getDiscount(); @@ -416,7 +417,7 @@ public class PurchaseServiceImpl implements PurchaseService { BigDecimal monthAverageAmount = totalAmount.divide(new BigDecimal(10), 2, RoundingMode.DOWN); List productDetailRespVOList = new ArrayList<>(); - for (ProductsDetailDO detailDO : productsDetailDOS) { + for (ProductsDetailDO detailDO : productsDetailDOS.stream().sorted(Comparator.comparingInt(ProductsDetailDO::getDuration)).collect(Collectors.toList())) { ProductDetailsRespVO newDetailRespVO = BeanUtils.toBean(detailDO, ProductDetailsRespVO.class); // 折扣 BigDecimal discount = detailDO.getDiscount();