Merge remote-tracking branch 'origin/master'

xuhy

3 天以前 72aaf45389cd09c206ee1b90f0c7f5bf59782930

 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);
}