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/BaseGoodsTemplateController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
index 50da269..fe31dc4 100644
--- a/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/BaseGoodsTemplateController.java
@@ -18,7 +18,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;
@@ -192,7 +192,7 @@
CommonUtil.copyProperties(goodsTemplate, param2);
goodsTemplate = param2;
- if (goodsTemplate == null || goodsTemplate.getId() == null || goodsTemplate.getStates() == null) {
+ if (goodsTemplate.getId() == null || goodsTemplate.getStates() == null) {
return ResponseValue.error("鍙傛暟閿欒");
}
@@ -269,7 +269,8 @@
Map<String, Object> map = new HashMap<>();
map.put("categoryId", categoryId);
- List<BaseWarehouse> baseWarehouseList = baseWarehouseService.getBaseWareHouseList(agencyId, null, (short)1);
+ List<BaseWarehouse> baseWarehouseList =
+ baseWarehouseService.getBaseWareHouseList(agencyId, StatesType.NORMAL.getValue());
if (CollectionUtils.isEmpty(baseWarehouseList)) {
return ResponseValue.error("鏈烘瀯鏃犱粨搴擄紒");
@@ -296,14 +297,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(), ImportGoodsInfoTemplate.class,
+ EasyExcelFactory.read(file.getInputStream(), ImportGoodsInfoTemplate.class,
new AnalysisEventListener<ImportGoodsInfoTemplate>() {
List<BaseGoodsTemplateParam> list = Lists.newArrayList();
--
Gitblit v1.9.1