From 6cfff55d44314e88fefd6e3adb290ec16b303f89 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期五, 05 一月 2024 10:42:53 +0800
Subject: [PATCH] 1、供产品导数据临时用(用户，机构，部门，仓库，库管员 可删) 2、选择库管员增加过滤参数
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
index 59bd8af..93b35a2 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java
@@ -27,7 +27,7 @@
import com.consum.base.pojo.response.FormInventoryDetailVO;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
-import com.consum.base.service.FinSysTenantUserServiceImpl;
+import com.consum.base.service.FinSysTenantUserService;
import com.consum.base.service.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
@@ -58,7 +58,7 @@
@Autowired
private LWhFormInventoryService lWhFormInventoryService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
+ private FinSysTenantUserService finSysTenantUserService;
/**
* @Description 鏂板
@@ -307,7 +307,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", 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,8 @@
map.put("monitorName", monitorName);
map.put("name", operatorName);
Workbook workbook = ExcelExportUtil.exportExcel(params, InventoryExcelTemplate.class, exportList, map);
- return downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
+ String filePath = downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
}
--
Gitblit v1.9.1