From a6077615d835d96ded47f2d170e22ea88e9a3099 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 11 五月 2026 15:23:19 +0800
Subject: [PATCH] 不合格处理：对接OA报错问题修复
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index b77a7fd..621ddeb 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -811,7 +811,7 @@
)
.ne(InsProduct::getIsBinding, 1));
insProducts.addAll(insProductMapper.selectFiberInsProduct(InsSampleIds, laboratory));
- if (insProducts.size() > 0) {
+ if (!insProducts.isEmpty()) {
String str = "";
int count = 0;
for (InsProduct product : insProducts) {
@@ -1716,8 +1716,8 @@
for (int i = startIndex; i < endIndex; i++) {
String cableTag = cableTags.get(i);
for (SampleProductExportDto sDto : collect.get(s)) {
- tellSet.add(sDto.getTell());
if (sDto.getCableTag().equals(cableTag)) {
+ tellSet.add(sDto.getTell());
lastValueList.add(sDto.getLastValue());
}
}
@@ -1745,22 +1745,6 @@
}
/**
- * 浣跨敤姝ｅ垯琛ㄨ揪寮忓幓闄ゅ瓧绗︿覆鏈�鍚庝竴涓�"-"鍙婂叾鍚庨潰鐨勬墍鏈夊唴瀹�
- * @param str 寰呭鐞嗙殑瀛楃涓诧紙鍏佽涓簄ull锛�
- * @return 澶勭悊鍚庣殑瀛楃涓诧紝null杩斿洖null锛屾棤"-"杩斿洖鍘熷瓧绗︿覆
- */
- public static String removeLastHyphenAndContent(String str) {
- // 绌哄�兼牎楠岋細閬垮厤NullPointerException
- if (str == null || str.isEmpty()) {
- return str;
- }
- // 姝ｅ垯琛ㄨ揪寮忥細鍖归厤鏈�鍚庝竴涓�"-"鍙婂叾鍚庨潰鐨勬墍鏈夊唴瀹�
- String regex = "-[^-]*$";
- // 鏇挎崲鍖归厤鐨勫唴瀹逛负绌哄瓧绗︿覆
- return str.replaceAll(regex, "");
- }
-
- /**
* 灏忔姤鍛婄敓鎴�
*
* @param orderId
@@ -1781,7 +1765,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
//鏌ヨ闆朵欢灞炴��
IfsPartPropsRecord ifsPartPropsRecord = ifsPartPropsRecordMapper.selectOne(Wrappers.<IfsPartPropsRecord>lambdaQuery()
- .eq(IfsPartPropsRecord::getIfsInventoryId, ifsInventoryQuantity.getId()));
+ .eq(IfsPartPropsRecord::getIfsInventoryId, ifsInventoryQuantity.getId()).last("limit 1"));
if (Objects.nonNull(ifsPartPropsRecord)) {
enterFactoryReport.setOuterColor(StringUtils.equals(ifsPartPropsRecord.getOuterColor(),"/")?ifsPartPropsRecord.getInsulationColor():ifsPartPropsRecord.getOuterColor());
}
@@ -1828,7 +1812,7 @@
//鏌ヨ妫�楠屽崟娑堟伅
InsSampleUserVO insSampleUser = insSampleUserMapper.selectUserNameByOrderId(orderId);
if (Objects.nonNull(insSampleUser)) {
- enterFactoryReport.setPartDesc(removeLastHyphenAndContent(insSampleUser.getModel()));
+ enterFactoryReport.setPartDesc(insSampleUser.getModel());
enterFactoryReport.setInspector(insSampleUser.getInspector());
enterFactoryReport.setInspectDate(insSampleUser.getInspectDate());
}
--
Gitblit v1.9.3