From e487f1bfa92d9e90dd8f876479bbfced09b4d58c Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 29 十二月 2023 14:04:18 +0800
Subject: [PATCH] 添加角色查询接口
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
index 963bfc0..3dfebf3 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantController.java
@@ -28,7 +28,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;
@@ -406,6 +406,8 @@
fileName = "鏈烘瀯瀵煎叆妯℃澘.xls";
} else if ("goods".equals(type)) {
fileName = "鐗╁搧淇℃伅.xls";
+ } else if ("procure".equals(type)) {
+ fileName = "閲囪喘瀵煎叆.xls";
}
Resource resource = new ClassPathResource("import/" + fileName);
// 鑾峰彇鏂囦欢杈撳叆娴�
@@ -424,7 +426,7 @@
@PostMapping("import")
public ResponseValue upload(@RequestParam Long pid, MultipartFile file) throws IOException {
String originalFilename = file.getOriginalFilename();
- if (!originalFilename.endsWith("xls")) {
+ if (!"xls".endsWith(originalFilename)) {
return ResponseValue.error("鏂囦欢鏍煎紡鏈夎!");
}
FinSysTenantUser sysInfo = this.getSysInfo();
@@ -437,7 +439,7 @@
return ResponseValue.error("涓嶈兘鍒涘缓鍘匡紙鍖猴級绾т互涓嬫満鏋�");
}
- EasyExcel
+ EasyExcelFactory
.read(file.getInputStream(), ImportTenantTemplate.class, new AnalysisEventListener<ImportTenantTemplate>() {
LinkedList<FinSysTenantParam> finSysTenantParams = new LinkedList<>();
@@ -518,10 +520,7 @@
if (sysInfo == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- // FinSysTenant finSysTenant1 = this.finSysTenantService.selectByTenantId(sysInfo.getTenantCode());
- // if (finSysTenant1.getLv() != 1) {
- // return ResponseValue.error("鏆傛棤淇敼鏉冮檺");
- // }
+
int num = this.finSysTenantService.updateFinSysTenant(param, this.getSysInfo());
return num > 0 ? ResponseValue.success(1) : ResponseValue.error("缂栬緫澶辫触锛�");
}
--
Gitblit v1.9.1