From f2aa969ac8085eb56427d6c75261e7a74bfe637f Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 16 十月 2025 11:26:08 +0800
Subject: [PATCH] 平台首页统计
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 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 e922cca..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
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.system.dto.AddProcurementDto;
+import com.ruoyi.system.export.PlatformLedgerReportExport;
import com.ruoyi.system.export.ProcurementReportClinicExport;
import com.ruoyi.system.export.ProcurementReportPlatformExport;
import com.ruoyi.system.export.ProcurementReportSupplierExport;
@@ -148,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);
+// }
}
@@ -735,4 +736,27 @@
return list;
}
+ @Override
+ public PageInfo<ClinicProcurementReportVO> platformLedgerReport(ClinicProcurementReportQuery query) {
+ PageInfo<ClinicProcurementReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<ClinicProcurementReportVO> list = this.baseMapper.platformLedgerReport(query, pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public List<PlatformLedgerReportExport> exportPlatformLedgerReport(ClinicProcurementReportQuery query) {
+ List<PlatformLedgerReportExport> list = this.baseMapper.exportPlatformLedgerReport(query);
+ if(CollectionUtils.isEmpty(list)){
+ return new ArrayList<>();
+ }
+ for (PlatformLedgerReportExport platformLedgerReportExport : list) {
+ if(Objects.nonNull(platformLedgerReportExport.getPayTime())){
+ String payTimeStr = new SimpleDateFormat("yyyy-MM-dd").format(platformLedgerReportExport.getPayTime());
+ platformLedgerReportExport.setPayTimeStr(payTimeStr);
+ }
+ }
+ return list;
+ }
+
}
--
Gitblit v1.7.1