From b16483ae0dff952639e4b7e152f72dc32e662154 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 18:13:33 +0800
Subject: [PATCH] 部门分发人显示错误
---
consum-base/src/main/java/com/consum/base/controller/LWhFormInventoryController.java | 47 ++++++++++++++++-------------------------------
1 files changed, 16 insertions(+), 31 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 710f2f3..0a6772f 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
@@ -13,7 +13,7 @@
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.LWhFormInventoryServiceImpl;
+import com.consum.base.service.LWhFormInventoryService;
import com.consum.model.po.FinSysTenantUser;
import com.consum.model.po.LWhFormInventory;
import com.iplatform.model.po.S_user_core;
@@ -26,10 +26,6 @@
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponse;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -56,7 +52,7 @@
public class LWhFormInventoryController extends BaseController {
@Autowired
- private LWhFormInventoryServiceImpl lWhFormInventoryService;
+ private LWhFormInventoryService lWhFormInventoryService;
@Autowired
private FinSysTenantUserServiceImpl finSysTenantUserService;
@@ -90,7 +86,7 @@
FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
monitorUserInfo.setId(param.getMonitorUserId());
FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo);
- int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
+ int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
if (result > 0) {
return ResponseValue.success();
}
@@ -117,7 +113,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- GenericPager<LWhFormInventory> pager = this.lWhFormInventoryService.queryList(param, sysInfo);
+ GenericPager<LWhFormInventory> pager = lWhFormInventoryService.queryList(param, sysInfo);
return ResponseValue.success(pager);
}
@@ -136,10 +132,10 @@
return ResponseValue.error("鍙傛暟涓嶈兘涓虹┖");
}
//閫氳繃鏈烘瀯鏌ヨ鐩稿叧鐨勬ā鏉夸俊鎭�
- FormInventoryVO formInventoryVO = this.lWhFormInventoryService.queryInventBaseGoodTemplate(id);
+ FormInventoryVO formInventoryVO = lWhFormInventoryService.queryInventBaseGoodTemplate(id);
// 淇濆瓨鍚庤繑鍥炶褰曚俊鎭�
- List<FormInventoryGoodsVO> result = this.lWhFormInventoryService.saveInventory(formInventoryVO, id);
+ FormInventoryVO result = lWhFormInventoryService.saveInventory(formInventoryVO, id);
return ResponseValue.success(result);
}
@@ -179,7 +175,7 @@
FinSysTenantUser monitorUserInfo = new FinSysTenantUser();
monitorUserInfo.setId(param.getMonitorUserId());
FinSysTenantUser monitorUser = finSysTenantUserService.get(monitorUserInfo);
- int result = this.lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
+ int result = lWhFormInventoryService.add(param, this.getSysInfo(), operatorUser, monitorUser);
if (result > 0) {
return ResponseValue.success();
@@ -237,7 +233,7 @@
return ResponseValue.error("鍙傛暟閿欒");
}
- int num = this.lWhFormInventoryService.updateInventoryInfo(param, 1, null, null);
+ int num = lWhFormInventoryService.updateInventoryInfo(param, 1, null, null);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鏆傚瓨澶辫触锛�");
}
@@ -263,7 +259,7 @@
}
S_user_core currentUser = this.getCurrentUser();
FinSysTenantUser sysInfo = this.getSysInfo();
- int num = this.lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo);
+ int num = lWhFormInventoryService.updateInventoryInfo(param, 2, currentUser, sysInfo);
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("鐩樼偣澶辫触锛�");
}
@@ -288,7 +284,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- PageUtil<FormInventoryDetailVO> result = this.lWhFormInventoryService.queryPdDetailList(param, sysInfo);
+ PageUtil<FormInventoryDetailVO> result = lWhFormInventoryService.queryPdDetailList(param, sysInfo);
return ResponseValue.success(result);
}
@@ -306,19 +302,22 @@
LWhFormInventory lWhFormInventory = new LWhFormInventory();
lWhFormInventory.setId(id);
- LWhFormInventory item = this.lWhFormInventoryService.get(lWhFormInventory);
+ LWhFormInventory item = lWhFormInventoryService.get(lWhFormInventory);
if (Objects.isNull(item)) {
return ResponseValue.error("鐩樼偣鍗曚笉瀛樺湪");
}
BeanUtils.copyProperties(item, formInventoryVO);
- List<FormInventoryGoodsVO> formInventoryGoodsVOS = this.lWhFormInventoryService.selectDetailById(id);
+ List<FormInventoryGoodsVO> formInventoryGoodsVOS = lWhFormInventoryService.selectDetailById(id);
formInventoryVO.setFormInventoryGoodsList(formInventoryGoodsVOS);
return ResponseValue.success(formInventoryVO);
}
@ApiOperation(value = "鐩樼偣鍗曞鍑�", notes = "鐩樼偣鍗曞鍑�")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "id", value = "鐩樼偣鍗昳d", dataType = "Long", required = true, paramType = "query")
+ })
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws IOException {
+ public void export(Long id, HttpServletResponse response) throws Exception {
List<InventoryExcelTemplate> exportList = lWhFormInventoryService.getExportList(id);
if (CollectionUtils.isEmpty(exportList)) {
@@ -343,20 +342,6 @@
exportList, map);
downLoadExcel("浣庡�兼槗鑰楀搧鐩樼偣琛�", response, workbook);
- }
-
- private void downLoadExcel(String fileName, HttpServletResponse response, Workbook workbook) {
- try (OutputStream out = response.getOutputStream()) {
- response.setCharacterEncoding("UTF-8");
- response.setHeader("content-Type", "application/vnd.ms-excel");
- response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xls", "UTF-8"));
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- workbook.write(baos);
- response.setHeader("Content-Length", String.valueOf(baos.size()));
- out.write(baos.toByteArray());
- } catch (Exception e) {
- logger.error("瀵煎嚭鏂囦欢澶辫触", e);
- }
}
--
Gitblit v1.9.1