From 69e70841125d2e1f12fca17b0751d6d8842fc6cf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 十月 2025 18:28:43 +0800
Subject: [PATCH] 平台分账报表
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 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 f2ae25c..9a1c86f 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;
@@ -52,6 +53,7 @@
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -109,6 +111,7 @@
@Resource
private TCrmWarehouseMapper crmWarehouseMapper;
+
@Override
public PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user) {
@@ -194,6 +197,7 @@
sTime = split[0] + " 00:00:00";
eTime = split[1] + " 23:59:59";
}
+
PageInfo<TErpProcurementVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
if(CollectionUtils.isEmpty(supplierClinicId)){
return pageInfo;
@@ -453,6 +457,13 @@
public DetailProcurementVO detailProcurement(String clinicSupplierId, SysUser user, String id) {
DetailProcurementVO detailProcurementVO = new DetailProcurementVO();
TErpProcurement tErpProcurement = this.getById(id);
+ if (tErpProcurement.getWarehousingUserId()!=null && !tErpProcurement.getWarehousingUserId().isEmpty()) {
+ SysUser sysUser = sysUserMapper.selectUserById(Long.valueOf(tErpProcurement.getWarehousingUserId()));
+ detailProcurementVO.setWarehousingUserName(sysUser.getUserName());
+ }
+ detailProcurementVO.setWarehousingTime(tErpProcurement.getWarehousingTime());
+
+
detailProcurementVO.setStatus(tErpProcurement.getStatus());
detailProcurementVO.setCreateTime(tErpProcurement.getCreateTime());
detailProcurementVO.setSendTime(tErpProcurement.getSendTime());
@@ -649,6 +660,11 @@
}
@Override
+ public List<TErpProcurementGoods> branchAdminStatisticsThree(List<String> clinicIds) {
+ return this.baseMapper.branchAdminStatisticsThree(clinicIds);
+ }
+
+ @Override
public PageInfo<ClinicProcurementReportVO> clinicProcurementReport(ClinicProcurementReportQuery query) {
PageInfo<ClinicProcurementReportVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<ClinicProcurementReportVO> list = this.baseMapper.clinicProcurementReport(query, pageInfo);
@@ -720,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