From 82cae82571a0c6c57ee5dc357efaf0e238c20ac9 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 14:54:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 1bf8ee0..ab94a57 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -285,9 +285,8 @@
// 鍚堝苟鍑芥暟锛氬綋鍚屼竴鈥滃ぉ鈥濇湁澶氫釜瀵硅薄鏃讹紝濡備綍澶勭悊锛堣繖閲岀ず渚嬪彇绗竴涓級
(existing, replacement) -> existing // 鑻ユ湁閲嶅閿紝淇濈暀宸插瓨鍦ㄧ殑瀵硅薄
));
- List<Map<String, Object>> resultList = new ArrayList<>();
+ Map<String, Object> resultMap = new LinkedHashMap<>();
for (int i = 1; i <= 31; i++) {
- Map<String, Object> resultMap = new HashMap<>();
if (groupMap.containsKey(i)) {
EamInsOrderDetailUserResponse eamInsOrderDetailUserResponse = groupMap.get(i);
resultMap.put("operator" + i, sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamInsOrderDetailUserResponse.getOperator()));
@@ -296,9 +295,8 @@
resultMap.put("operator" + i, "");
resultMap.put("confirmUser" + i, "");
}
- resultList.add(resultMap);
}
- result.put("data", resultList);
+ result.put("data", Collections.singletonList(resultMap));
return result;
}
@@ -403,9 +401,8 @@
// 鍚堝苟鍑芥暟锛氬綋鍚屼竴鈥滃ぉ鈥濇湁澶氫釜瀵硅薄鏃讹紝濡備綍澶勭悊锛堣繖閲岀ず渚嬪彇绗竴涓級
(existing, replacement) -> existing // 鑻ユ湁閲嶅閿紝淇濈暀宸插瓨鍦ㄧ殑瀵硅薄
));
- List<Map<String, Object>> resultList = new ArrayList<>();
+ Map<String, Object> resultMap = new LinkedHashMap<>();
for (int i = 1; i <= 5; i++) {
- Map<String, Object> resultMap = new HashMap<>();
if (groupMap.containsKey(i)) {
EamWeekInsDetailUserResponse eamWeekInsDetailUserResponse = groupMap.get(i);
resultMap.put("operator" + i, sysDictService.queryTableDictTextByKey("sys_user", "realname", "username", eamWeekInsDetailUserResponse.getInspector()));
@@ -414,9 +411,9 @@
resultMap.put("operator" + i, "");
resultMap.put("confirmUser" + i, "");
}
- resultList.add(resultMap);
}
- result.put("data", resultList);
+ result.put("data", Collections.singletonList(resultMap));
+
return result;
}
--
Gitblit v1.9.3