Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-09-13 be8a84dd3610443ebc82a9c75f888920b882bf01

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -151,6 +151,18 @@
        return  Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));

    }

    @SaCheckPermission("orderReport.search")
    @ApiOperation("查询订单总报表")
    @PostMapping("/getOrderSummaryReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getOrderSummaryReport(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody Order order)  {
        return  Result.seccess(orderService.getOrderSummaryReport(pageNum,pageSize,selectDate,order));

    }

    @ApiOperation("订单报表导出")
    @PostMapping("/exportOrderReport")
    public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
@@ -164,6 +176,14 @@
    public void exportOrderProductSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {
        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, OrderDTO.class, orderService.exportOrderProductSummary(dates),"orderReport");
    }

    @ApiOperation("订单总报表导出")
    @PostMapping("/exportOrderSummary")
    public void exportOrderSummary(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {

        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response, Order.class, orderService.exportOrderSummary(dates),"orderReport");
    }


@@ -204,5 +224,12 @@
        return  Result.seccess(orderService.updateOrderPrintNumber(orderId));
    }

    @ApiOperation("修改订单号")
    @SaCheckPermission("createOrder.amountReset")
    @PostMapping("/updateOrderId")
    public Result updateOrderId(@RequestBody Map<String,Object> map)  {
        return  Result.seccess(orderService.updateOrderId(map));
    }


}