From 2536f425d95d2e21aa1d61e942b52f10947c9300 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 19:15:50 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
index c7283a6..51b6c57 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTechnicalTitleController.java
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.*;
+import java.util.stream.Collectors;
/**
* <p>
@@ -183,21 +184,25 @@
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("全部".equals(techImportExcel.getAddress())){
+ List<TRegion> list = regionService.lambdaQuery().list();
+ regionIds = list.stream().map(TRegion::getId).collect(Collectors.toList());
+ }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;
}
}
- if (regionIds.size() != split.length) {
- continue;
- }
-
}
TTechnicalTitle tTechnicalTitle = new TTechnicalTitle();
tTechnicalTitle.setTitileName(techImportExcel.getTitileName());
@@ -215,7 +220,7 @@
e.printStackTrace();
// logger.error("批量购入导入失败:{}",e.getMessage());
// importRecordService.removeById(tImportRecord.getId());
- return R.fail("批量购入导入失败!");
+ return R.fail("批量导入失败!");
}finally {
try {
inputStream.close();
--
Gitblit v1.7.1