Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-12-21 331c41ca7f21b81985ba23d60ec05c350d21daa8

 src/main/java/com/mzl/flower/service/statisticsAnalysis/StatisticAnalysisService.java

@@ -2,8 +2,11 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.request.statisticAnalysis.FlowerMaterialDTO;
import com.mzl.flower.dto.request.statisticAnalysis.FlowerSaleDTO;
import com.mzl.flower.dto.response.statisticAnalysis.FlowerMaterialStaticVO;
import com.mzl.flower.dto.response.statisticAnalysis.FlowerSaleStatisticVO;
import com.mzl.flower.dto.response.statisticAnalysis.FlowerMaterialVO;
import com.mzl.flower.dto.response.statisticAnalysis.FlowerSaleVO;

import javax.servlet.http.HttpServletResponse;

@@ -15,4 +18,11 @@
    FlowerMaterialStaticVO getFlowerMaterialStatis(FlowerMaterialDTO dto);

    void exportFlowerMaterialSales(HttpServletResponse response, FlowerMaterialDTO dto);


    Page<FlowerSaleVO> getFlowerSalePage(Page page, FlowerSaleDTO dto);

    FlowerSaleStatisticVO getFlowerSaleStatistics(FlowerSaleDTO dto);

    void exportFlowerSales(HttpServletResponse response, FlowerSaleDTO dto);
}