From 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 20 十月 2025 17:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
index 57b2837..d23b4c0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
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;
@@ -11,6 +12,7 @@
import com.ruoyi.system.model.TErpProcurement;
import com.ruoyi.system.model.TErpProcurementGoods;
import com.ruoyi.system.query.ClinicProcurementReportQuery;
+import com.ruoyi.system.query.PerformanceReportQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.query.TErpProcurementQuery;
import com.ruoyi.system.vo.*;
@@ -153,4 +155,46 @@
* @return
*/
List<ProcurementReportPlatformExport> exportProcurementReportPlatform(ClinicProcurementReportQuery query);
+
+ /**
+ * 平台分账报表
+ * @param query
+ * @return
+ */
+ PageInfo<ClinicProcurementReportVO> platformLedgerReport(ClinicProcurementReportQuery query);
+
+ /**
+ * 平台分账报表导出
+ * @param query
+ * @return
+ */
+ List<PlatformLedgerReportExport> exportPlatformLedgerReport(ClinicProcurementReportQuery query);
+
+ /**
+ * 分公司业绩报表
+ * @param query
+ * @return
+ */
+ PageInfo<BranchPerformanceReportVO> branchPerformanceReport(PerformanceReportQuery query);
+
+ /**
+ * 业务员业绩报表
+ * @param query
+ * @return
+ */
+ PageInfo<SalespersonPerformanceReportVO> salespersonPerformanceReport(PerformanceReportQuery query);
+
+ /**
+ * 分公司业绩报表导出
+ * @param query
+ * @return
+ */
+ List<BranchPerformanceReportVO> exportBranchPerformanceReport(PerformanceReportQuery query);
+
+ /**
+ * 业务员业绩报表导出
+ * @param query
+ * @return
+ */
+ List<SalespersonPerformanceReportVO> exportSalespersonPerformanceReport(PerformanceReportQuery query);
}
--
Gitblit v1.7.1