From 3be9cfcb6b59366b936821966d20a998a6895f9f Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期二, 30 四月 2024 14:38:13 +0800
Subject: [PATCH] bug41、42修改
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 0b05a92..e6538a8 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -21,7 +21,7 @@
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
-import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.EasyExcelFactory;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
@@ -216,7 +216,7 @@
* 鏍规嵁id鏌ヨ璇︽儏
*/
@GetMapping("/detail")
- public ResponseValue getById(Long id) throws IllegalAccessException {
+ public ResponseValue getById(Long id) throws Exception {
if (id == null) {
return ResponseValue.error("閲囪喘鍗昳d涓虹┖");
}
@@ -289,7 +289,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
+ // formProcureQry.setAgencyId(Long.valueOf(sysInfo.getTenantId()));
GenericPager genericPager = lWhFormProcureService.queryFormProcureDetailList(formProcureQry);
return ResponseValue.success(genericPager);
}
@@ -329,7 +329,7 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, ProcureExcelTemplate.class, exportList, map);
- String filePath = downLoadExcel("閲囪喘鍏ュ簱鍗�", response, workbook);
+ String filePath = downLoadExcel("閲囪喘鍏ュ簱鍗�", workbook);
return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
@@ -338,14 +338,14 @@
@PostMapping("/import")
public ResponseValue upload(MultipartFile file) throws IOException {
String originalFilename = file.getOriginalFilename();
- if (!originalFilename.endsWith(".xls")) {
+ if (!".xls".endsWith(originalFilename)) {
return ResponseValue.error("鏂囦欢鏍煎紡鏈夎!");
}
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
return ResponseValue.error("褰撳墠鐧诲綍鐢ㄦ埛涓虹┖");
}
- EasyExcel.read(file.getInputStream(), ImportProcureOrderTemplate.class,
+ EasyExcelFactory.read(file.getInputStream(), ImportProcureOrderTemplate.class,
new AnalysisEventListener<ImportProcureOrderTemplate>() {
List<LWhFormProcureParam> list = Lists.newArrayList();
--
Gitblit v1.9.1