From 36ccc814cb2499757a0cfd5525d5e8d0c2309b64 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 27 十一月 2024 16:02:42 +0800
Subject: [PATCH] 企业微信的消息提醒的信息改成单号样品名+检验下单的模版保存,如果存在同名的情况,将原有的情况覆盖掉,并添加提示框+首页展示添加样品名称
---
cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
index 15d8019..dff4725 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/utils/DataAcquisition.java
@@ -314,7 +314,10 @@
*/
private static Object calculationFormula(List<Object> list, DataConfig dataConfig, String insProductItem, Device device) {
if (list.size() == 0) {
- return null;
+ Map<String, Object> hashMap = new HashMap<>();
+ hashMap.put("equipName", device.getDeviceName());
+ hashMap.put("equipValue", device.getManagementNumber());
+ return hashMap;
}
ArrayList<Object> listResult = new ArrayList<>();
Map<String, Object> hashMap = new HashMap<>();
--
Gitblit v1.9.3