From c8fbeff3b07f96ffb4624dd64344ac00ec0c8ef8 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 18 七月 2025 11:03:47 +0800
Subject: [PATCH] 1.优化正式库 2.yml设置
---
main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java b/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java
index eba9e50..aa53535 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/impl/OfficialInventoryServiceImpl.java
@@ -94,7 +94,7 @@
if (!registrantIds.isEmpty()) {
List<SysUser> sysUsers = sysUserMapper.selectList(registrantIds);
userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, Function.identity()));
- }else {
+ } else {
userMap = new HashMap<>();
}
@@ -391,7 +391,15 @@
dto.setSupplierCoal(supply.getSupplierName() + " - " + coalInfo.getCoal());
}
// 璁剧疆鐓よ川鏁版嵁
- dto.setCoalValues(coalValuesMap.getOrDefault(inventory.getCoalPlanId(), Collections.emptyList()));
+ dto.setCoalValues(coalValuesMap.getOrDefault(inventory.getCoalPlanId(), Collections.emptyList())
+ .stream()
+ .map(coalValue -> {
+ Map<String, String> map = new HashMap<>();
+ map.put("fieldName", coalValue.getFieldName());
+ map.put("coalValue", coalValue.getCoalValue());
+ return map;
+ })
+ .collect(Collectors.toList()));
return dto;
})
.collect(Collectors.toList());
--
Gitblit v1.9.3