From 901bab9b8b1c3773a644bdc74f5eafd666591aeb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 13:37:24 +0800
Subject: [PATCH] feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制
---
cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
index d4aac72..015802e 100644
--- a/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
+++ b/cnas-require/src/main/java/com/ruoyi/require/service/impl/FeStandardSubstanceServiceImpl.java
@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.framework.exception.ErrorException;
@@ -23,11 +22,8 @@
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashSet;
import java.util.List;
import java.util.Locale;
-import java.util.Set;
-import java.util.stream.Collectors;
/**
* <p>
@@ -85,26 +81,11 @@
throw new ErrorException("瀵煎叆鏂囦欢娌℃湁鏍囧噯鐗╄川鏁版嵁");
}
- Set<String> manageNumbers = new HashSet<>();
- for (int i = 0; i < rows.size(); i++) {
- String manageNum = required(rows.get(i).getManageNum(), i + 2, "绠＄悊缂栧彿");
- if (!manageNumbers.add(manageNum)) {
- throw new ErrorException("绗�" + (i + 2) + "琛岋細绠＄悊缂栧彿" + manageNum + "鍦ㄦ枃浠朵腑閲嶅");
- }
- }
- Set<String> existingNumbers = baseMapper.selectList(Wrappers.<FeStandardSubstance>lambdaQuery()
- .in(FeStandardSubstance::getManageNum, manageNumbers)
- .select(FeStandardSubstance::getManageNum))
- .stream().map(FeStandardSubstance::getManageNum).collect(Collectors.toSet());
-
List<FeStandardSubstance> substances = new ArrayList<>();
for (int i = 0; i < rows.size(); i++) {
int rowNumber = i + 2;
FeStandardSubstanceImport row = rows.get(i);
String manageNum = required(row.getManageNum(), rowNumber, "绠＄悊缂栧彿");
- if (existingNumbers.contains(manageNum)) {
- throw new ErrorException("绗�" + rowNumber + "琛岋細绠＄悊缂栧彿" + manageNum + "宸插瓨鍦�");
- }
FeStandardSubstance substance = new FeStandardSubstance();
substance.setName(required(row.getName(), rowNumber, "鏍囧噯鐗╄川鍚嶇О"));
@@ -160,4 +141,4 @@
private String trim(String value) {
return value == null ? null : value.trim();
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3