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/mapper/TErpProcurementMapper.java | 79 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
index 0eadac6..7c8ce6f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java
@@ -3,7 +3,14 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.system.export.PlatformLedgerReportExport;
+import com.ruoyi.system.export.ProcurementReportClinicExport;
+import com.ruoyi.system.export.ProcurementReportPlatformExport;
+import com.ruoyi.system.export.ProcurementReportSupplierExport;
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.*;
@@ -28,7 +35,7 @@
List<TErpGoodsVO> inventoryNotEnoughList(@Param("user") SysUser user);
- List<TErpProcurementVo> pageListWarehouse(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("supplierClinicId") String supplierClinicId);
+ List<TErpProcurementVo> pageListWarehouse(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("supplierClinicId") List<String> supplierClinicId);
List<SupplierThirtyProcurementStatisticsVO> supplierThirtyProcurementStatistics(@Param("supplierAndClinicId")String supplierAndClinicId,
@Param("startTime")String startTime,
@@ -87,4 +94,74 @@
@Param("endTime")String endTime,
@Param("goodsName")String goodsName);
+ /**
+ * 诊所采购报表
+ * @param query
+ * @return
+ */
+ List<ClinicProcurementReportVO> clinicProcurementReport(@Param("query")ClinicProcurementReportQuery query, @Param("pageInfo")PageInfo<ClinicProcurementReportVO> pageInfo);
+
+ /**
+ * 诊所采购报表导出
+ * @param query
+ * @return
+ */
+ List<ProcurementReportClinicExport> exportProcurementReportClinic(@Param("query")ClinicProcurementReportQuery query);
+
+ /**
+ * 供应商-诊所采购报表导出
+ * @param query
+ * @return
+ */
+ List<ProcurementReportSupplierExport> exportProcurementReportSupplier(@Param("query")ClinicProcurementReportQuery query);
+
+ /**
+ * 平台-诊所采购报表导出
+ * @param query
+ * @return
+ */
+ List<ProcurementReportPlatformExport> exportProcurementReportPlatform(@Param("query")ClinicProcurementReportQuery query);
+ List<TErpProcurementGoods> branchAdminStatisticsThree(@Param("clinicIds") List<String> clinicIds);
+
+ /**
+ * 平台分账报表
+ * @param query
+ * @return
+ */
+ List<ClinicProcurementReportVO> platformLedgerReport(@Param("query")ClinicProcurementReportQuery query, @Param("pageInfo")PageInfo<ClinicProcurementReportVO> pageInfo);
+
+ /**
+ * 平台分账报表导出
+ * @param query
+ * @return
+ */
+ List<PlatformLedgerReportExport> exportPlatformLedgerReport(@Param("query")ClinicProcurementReportQuery query);
+
+ /**
+ * 分公司业绩报表
+ * @param query
+ * @return
+ */
+ List<BranchPerformanceReportVO> branchPerformanceReport(@Param("query")PerformanceReportQuery query, @Param("pageInfo")PageInfo<BranchPerformanceReportVO> pageInfo);
+
+ /**
+ * 业务员业绩报表
+ * @param query
+ * @return
+ */
+ List<SalespersonPerformanceReportVO> salespersonPerformanceReport(@Param("query")PerformanceReportQuery query, @Param("pageInfo")PageInfo<SalespersonPerformanceReportVO> pageInfo);
+
+ /**
+ * 分公司业绩报表导出
+ * @param query
+ * @return
+ */
+ List<BranchPerformanceReportVO> exportBranchPerformanceReport(@Param("query")PerformanceReportQuery query);
+
+ /**
+ * 业务员业绩报表导出
+ * @param query
+ * @return
+ */
+ List<SalespersonPerformanceReportVO> exportSalespersonPerformanceReport(@Param("query")PerformanceReportQuery query);
}
--
Gitblit v1.7.1