From 234b0ac195934b34c06045b2d2ef0f10e239dd8e Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 23 四月 2025 00:06:54 +0800
Subject: [PATCH] 系统合并
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 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 bbce5a1..68ad415 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
@@ -499,13 +499,15 @@
}
}
- //鏌ヨ妫�楠屽崟淇℃伅
// 娣诲姞宸ユ椂
- InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
- threadPoolTaskExecutor.execute(() -> {
- InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
- this.addAuxiliary(userId, finalInsProduct, insOrder);
- });
+ // 鍒ゆ柇鏄惁鍙槸鍙備笌璁＄畻鍊�, 鍙備笌璁＄畻鍊煎疄闄呮病鏈夊～鍐�
+ if (StringUtils.isNotBlank(newResult.getInsValue()) && !newResult.getInsValue().equals("[]")) {
+ InsProduct finalInsProduct = insProductMapper.selectById(product.getId());
+ threadPoolTaskExecutor.execute(() -> {
+ InsOrder insOrder = insOrderMapper.selectById(insSample.getInsOrderId());
+ this.addAuxiliary(userId, finalInsProduct, insOrder);
+ });
+ }
}
});
@@ -820,9 +822,10 @@
// 5.鍙戦�佹秷鎭�氱煡缁欏鏍镐汉
// 鏌ヨ褰撳墠浜轰俊鎭�
Integer userId = SecurityUtils.getUserId().intValue();
- String userName = insProductMapper.selectUserById(userId).get("name");
+ Map<String, String> userMap = insProductMapper.selectUserById(verifyUser);
+ String userName = userMap.get("name");
// 鏌ヨ鍙戦�佷汉淇℃伅
- String sendUserAccount = insProductMapper.selectUserById(verifyUser).get("account");
+ String sendUserAccount = userMap.get("account");
InformationNotification info = new InformationNotification();
info.setCreateUser(userName);
info.setMessageType("2");
@@ -909,7 +912,7 @@
.last("limit 1"));
threadPoolTaskExecutor.execute(() -> {
String message = "";
- message += "妫�楠屼换鍔″鏍搁�氱煡";
+ message += "鑰愪笣绯荤粺妫�楠屼换鍔″鏍搁�氱煡";
message += "\n鎻愪氦浜�: " + userName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
@@ -936,7 +939,7 @@
// 鏌ヨifs淇℃伅鑾峰彇鑾峰彇鍓�10涓緵搴斿晢涓�鏍风殑, 妫�楠岄」涓�鏍蜂俊鎭�
threadPoolTaskExecutor.execute(() -> {
// 娣诲姞鍒嗘瀽鏁版嵁
- addAnalysis(productList, ifsInventoryQuantity, order, userName);
+ addAnalysis(productList, ifsInventoryQuantity, order, sendUserAccount);
});
@@ -1170,7 +1173,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "鎶ュ憡缂栧埗瀹℃壒閫氱煡";
+ message += "鑰愪笣绯荤粺鎶ュ憡缂栧埗瀹℃壒閫氱煡";
message += "\n妫�楠屼汉: " + userName;
message += "\n澶嶆牳浜�: " + chenkUserName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
@@ -1212,7 +1215,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(order.getIfsInventoryId());
String message = "";
- message += "妫�楠屼换鍔″鏍搁��鍥為�氱煡";
+ message += "鑰愪笣绯荤粺妫�楠屼换鍔″鏍搁��鍥為�氱煡";
message += "\n澶嶆牳浜�: " + userName;
message += "\n濮旀墭缂栧彿: " + order.getEntrustCode();
message += "\n鏍峰搧鍚嶇О: " + insSample.getModel();
--
Gitblit v1.9.3