From 49dd9ee3dea22203cd1a0cc53745cffb6607122c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 十月 2025 18:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
index 9a1c86f..01d0b6d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java
@@ -149,25 +149,25 @@
List<String> ids = list.stream().map(TErpProcurementVo::getId).collect(Collectors.toList());
List<TErpProcurementGoods> tErpProcurementGoods = erpProcurementGoodsMapper.selectList
(new LambdaQueryWrapper<TErpProcurementGoods>().in(TErpProcurementGoods::getProcurementId, ids));
- List<TSysCommission> tSysCommissions = new ArrayList<>();
- if (!tErpProcurementGoods.isEmpty()) {
- List<String> collect = tErpProcurementGoods.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
- tSysCommissions = sysCommissionMapper.selectList(new LambdaQueryWrapper<TSysCommission>().in(TSysCommission::getTErpProcurementGoodsId, collect));
- }
+//// List<TSysCommission> tSysCommissions = new ArrayList<>();
+// if (!tErpProcurementGoods.isEmpty()) {
+//// List<String> collect = tErpProcurementGoods.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
+//// tSysCommissions = sysCommissionMapper.selectList(new LambdaQueryWrapper<TSysCommission>().in(TSysCommission::getTErpProcurementGoodsId, collect));
+// }
for (TErpProcurementVo tErpProcurementVo : list) {
List<TErpProcurementGoods> collect = tErpProcurementGoods.stream().filter(e -> e.getProcurementId().equals(tErpProcurementVo.getId())).collect(Collectors.toList());
int size = collect.stream().map(TErpProcurementGoods::getGoodsId).collect(Collectors.toSet()).size();
tErpProcurementVo.setTypeNum(size);
BigDecimal reduce = collect.stream().map(TErpProcurementGoods::getTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
tErpProcurementVo.setTotalPrice(reduce);
- if (!collect.isEmpty()) {
- List<String> collect1 = collect.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
- List<TSysCommission> collect2 = tSysCommissions.stream().filter(e -> collect1.contains(e.getTErpProcurementGoodsId())).collect(Collectors.toList());
- BigDecimal reduce1 = collect2.stream().filter(e -> e.getType() == 1).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal reduce2 = collect2.stream().filter(e -> e.getType() == 2).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
- tErpProcurementVo.setPlatformMoney(reduce1);
- tErpProcurementVo.setSupplierMoney(reduce2);
- }
+// if (!collect.isEmpty()) {
+//// List<String> collect1 = collect.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
+//// List<TSysCommission> collect2 = tSysCommissions.stream().filter(e -> collect1.contains(e.getTErpProcurementGoodsId())).collect(Collectors.toList());
+//// BigDecimal reduce1 = collect2.stream().filter(e -> e.getType() == 1).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+//// BigDecimal reduce2 = collect2.stream().filter(e -> e.getType() == 2).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+//// tErpProcurementVo.setPlatformMoney(reduce1);
+//// tErpProcurementVo.setSupplierMoney(reduce2);
+// }
}
--
Gitblit v1.7.1