Merge remote-tracking branch 'origin/master'

石广澎

2023-12-12 44b1fe9c919f833151445a30ba978beb041f8692

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

@@ -155,7 +155,7 @@
    @ApiOperation(value = "导出报废单", notes = "导出报废单")
    @ApiImplicitParams({@ApiImplicitParam(name = "id", value = "报废单id", dataType = "Long", paramType = "query")})
    @GetMapping("/list/export")
    public String export(Long id, HttpServletResponse response) throws Exception {
    public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {
        if (id == null) {
            throw new RuntimeException("报废单id为空");
        }
@@ -186,7 +186,7 @@
        map.put("totalAmount", totalAmount);

        Workbook sheets = ExcelExportUtil.exportExcel(exportParams, ScrappedInfoExcelTemplate.class, export, map);
        return downLoadExcel("报废登记单", response, sheets);
        return ResponseValue.success(downLoadExcel("报废登记单", response, sheets));

    }