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

guoyuji

2024-05-20 62f9be38c4594ddaef9078d3c131a646ba107314

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

@@ -104,6 +104,17 @@
        return  Result.seccess(orderService.getOrderReport(pageNum,pageSize,selectDate,orderDetail));

    }

    //@SaCheckPermission("orderProductSummary.search")
    @ApiOperation("查询订单产品汇总报表")
    @PostMapping("/getOrderProductSummary/{pageNum}/{pageSize}/{selectDate}")
    public Result getOrderProductSummary(@PathVariable Integer pageNum,
                                 @PathVariable Integer pageSize,
                                 @PathVariable List<String> selectDate,
                                 @RequestBody OrderDetail orderDetail)  {
        return  Result.seccess(orderService.getOrderProductSummary(pageNum,pageSize,selectDate,orderDetail));

    }
    @ApiOperation("订单报表导出")
    @PostMapping("/exportOrderReport")
    public void exportOrderReport(HttpServletResponse response) throws IOException, IllegalAccessException, InstantiationException {