From 9e530fa2aee385cb331e3c76d0765e78c40e35f7 Mon Sep 17 00:00:00 2001 From: 陶杰 <1378534974@qq.com> Date: 星期四, 10 十月 2024 13:44:08 +0800 Subject: [PATCH] 1.增加基类是ID是string且是逻辑删的 2.财务报表-合伙人报表 --- src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java b/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java index a53178a..741d754 100644 --- a/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java +++ b/src/main/java/com/mzl/flower/web/v2/report/OrderReportController.java @@ -37,14 +37,14 @@ @GetMapping("/sale/page") @ApiOperation(value = "查询-分页", notes = "查询-分页") public ResponseEntity<ReturnDataDTO<Page<OrderReportResultVO>>> page( - Page page, QueryOrderDTO dto + Page page,@Validated QueryOrderDTO dto ) { return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(orderReportService.getSalePage(page,dto), OrderReportResultVO.class)); } @GetMapping("/sale/statis") @ApiOperation(value = "统计", notes = "统计") - public ResponseEntity<ReturnDataDTO<OrderReportResultVO>> statis(QueryOrderDTO dto + public ResponseEntity<ReturnDataDTO<OrderReportResultVO>> statis(@Validated QueryOrderDTO dto ) { return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(orderReportService.getSaleStatis(dto), OrderReportResultVO.class)); } @@ -52,7 +52,7 @@ @GetMapping({"/sale/export"}) @ApiOperation(value = "报告列表导出") - public void exportSales(HttpServletResponse response, QueryOrderDTO dto){ + public void exportSales(HttpServletResponse response,@Validated QueryOrderDTO dto){ orderReportService.exportSalesList(response, dto); } @@ -68,4 +68,26 @@ orderReportService.exportOrderDetail(response, queryOrderDTO); } + + @GetMapping("/partner/sale/page") + @ApiOperation(value = "合伙人-查询-分页", notes = "合伙人-查询-分页") + public ResponseEntity<ReturnDataDTO<Page<OrderReportResultVO>>> getPartnerPage( + Page page,@Validated QueryOrderDTO dto + ) { + return returnData(R.SUCCESS.getCode(), ConverterUtil.transPage(orderReportService.getPartnerSalePage(page,dto), OrderReportResultVO.class)); + } + + @GetMapping("/partner/sale/statis") + @ApiOperation(value = "合伙人-查询-分页", notes = "合伙人-查询-分页") + public ResponseEntity<ReturnDataDTO<Page<OrderReportResultVO>>> getPartnerPageStatis(@Validated QueryOrderDTO dto + ) { + return returnData(R.SUCCESS.getCode(), ConverterUtil.transObject(orderReportService.getPartnerSaleStatis(dto), OrderReportResultVO.class)); + } + + @GetMapping({"/partner/sale/export"}) + @ApiOperation(value = "合伙人报告列表导出") + public void partnerExportSales(HttpServletResponse response,@Validated QueryOrderDTO dto){ + orderReportService.exportPartnerSalesList(response, dto); + } + } \ No newline at end of file -- Gitblit v1.9.3