Merge remote-tracking branch 'origin/master'

石广澎

2023-12-12 44b1fe9c919f833151445a30ba978beb041f8692

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

@@ -307,7 +307,7 @@
    @ApiImplicitParams({
        @ApiImplicitParam(name = "id", value = "盘点单id", dataType = "Long", required = true, paramType = "query")})
    @GetMapping("/list/export")
    public String export(Long id, HttpServletResponse response) throws Exception {
    public ResponseValue<String> export(Long id, HttpServletResponse response) throws Exception {

        List<InventoryExcelTemplate> exportList = lWhFormInventoryService.getExportList(id);
        if (CollectionUtils.isEmpty(exportList)) {
@@ -329,7 +329,7 @@
        map.put("monitorName", monitorName);
        map.put("name", operatorName);
        Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
        return downLoadExcel("低值易耗品盘点表", response, workbook);
        return ResponseValue.success(downLoadExcel("低值易耗品盘点表", response, workbook));
    }

}