Merge remote-tracking branch 'origin/master'

石广澎

2023-12-12 45bfb77d4b4d1b1d3204475caba9b9c0e3e04ef9

 consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java

@@ -215,7 +215,7 @@
    @ApiOperation(value = "出库单导出", notes = "出库单导出")
    @ApiImplicitParam(name = "id", value = "出库单id", required = true, dataType = "Long", paramType = "query")
    @GetMapping("/list/export")
    public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
    public ResponseValue export(Long id, HttpServletResponse response) throws Exception {
        FinSysTenantUser sysInfo = this.getSysInfo();
        if (sysInfo == null) {
            throw new RuntimeException("登录用户信息不存在");
@@ -251,7 +251,8 @@
        map.put("totalAmount", totalAmount);

        Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
        return ResponseValue.success(downLoadExcel("出库单", response, workbook));
        String filePath = downLoadExcel("出库单", response, workbook);
        return ResponseValue.success("导出成功", filePath);

    }