From 381bd9f6a9525b11d574b4a4f79925d99d3ad626 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 22:05:59 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java
index acb3d02..4c9651a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTitleMajorController.java
@@ -25,6 +25,7 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -128,8 +129,6 @@
public R export (@RequestParam("file") MultipartFile file) {
List<TTitleMajor> tTechnicalTitles = new ArrayList<>();
-
-
int errorLines = 0;
int successLines = 0;
ImportParams params = new ImportParams();
@@ -145,47 +144,44 @@
List<MahorImportExcel> techImportExcels = ExcelImportUtil.importExcel(inputStream, MahorImportExcel.class, params);
for (MahorImportExcel techImportExcel : techImportExcels) {
- List<Integer> regionIds;
- if (techImportExcel.getAddress() == null || StringUtils.isEmpty(techImportExcel.getAddress())) {
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不能为空";
- failMsg.add(msg);
- continue;
- } else {
- String[] split = techImportExcel.getAddress().split(";");
- regionIds = new ArrayList<>();
- for (String s : split) {
- TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one();
- if (region == null) {
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,地区不存在";
- failMsg.add(msg);
- } else {
- regionIds.add(region.getId());
- }
- }
- if (regionIds.size() != split.length) {
- continue;
- }
-
- }
+// List<Integer> regionIds;
+// if (techImportExcel.getAddress() == null || StringUtils.isEmpty(techImportExcel.getAddress())) {
+// msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,地区不能为空";
+// failMsg.add(msg);
+// continue;
+// } else {
+// String[] split = techImportExcel.getAddress().split(";");
+// regionIds = new ArrayList<>();
+// for (String s : split) {
+// TRegion region = regionService.lambdaQuery().like(TRegion::getName, s).one();
+// if (region == null) {
+// msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,地区不存在";
+// failMsg.add(msg);
+// } else {
+// regionIds.add(region.getId());
+// }
+// }
+// if (regionIds.size() != split.length) {
+// continue;
+// }
+//
+// }
TTitleMajor tTechnicalTitle = new TTitleMajor();
if (techImportExcel.getTitileName()==null||StringUtils.isEmpty(techImportExcel.getTitileName())){
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,职称名称不能为空";
+ msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,职称名称不能为空";
failMsg.add(msg);
continue;
}else {
TTechnicalTitle one = tTechnicalTitleService.lambdaQuery().eq(TTechnicalTitle::getTitileName, techImportExcel.getTitileName()).last("limit 1").one();
if (one!=null){
tTechnicalTitle.setTechnicalId(one.getId());
+ tTechnicalTitle.setRegionIds(one.getRegionIds());
}else {
- msg = "第" + techImportExcels.indexOf(techImportExcel) + "行,职称名称不存在";
+ msg = "第" + techImportExcels.indexOf(techImportExcel)+1 + "行,职称名称不存在";
failMsg.add(msg);
continue;
}
}
-
-
-
- tTechnicalTitle.setRegionIds(StringUtils.join(regionIds, ","));
tTechnicalTitle.setMajorName(techImportExcel.getMajorName());
tTechnicalTitles.add(tTechnicalTitle);
}
@@ -193,7 +189,7 @@
if (failMsg.size()==0){
tTitleMajorService.saveBatch(tTechnicalTitles);
}else {
- return R.fail(failMsg);
+ return R.fail(failMsg.stream().collect(Collectors.joining(",")));
}
} catch (Exception e) {
--
Gitblit v1.7.1