From c80a342eacd6b639c486eb47afdf04984d54183e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 03 二月 2026 13:25:13 +0800
Subject: [PATCH] 不合格管理：重新提交oa功能调整3
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 18 +-----------------
1 files changed, 1 insertions(+), 17 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..060cb87 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
@@ -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
@@ -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