From 4235b508143509b4f8aa85c8b561313f131b1d4b Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期四, 20 三月 2025 21:12:08 +0800
Subject: [PATCH] #修改 物料列表返回字段优化
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
index 8a6897f..7b53065 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java
@@ -50,6 +50,28 @@
return fieldsMap;
}
+
+ public static void mergeFields(Map<String, Object> fileds ,String uuid) {
+ FieldsService fieldsService = SpringUtils.getBean(FieldsService.class);
+ List<Fields> fields = fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getFlagEnable, 1).eq(Fields::getStatus, 1));
+ if (fields.isEmpty()) {
+ return;
+ }
+ FieldsItemService fieldsItemService = SpringUtils.getBean(FieldsItemService.class);
+ List<FieldsItem> fieldsItems = fieldsItemService.list(new LambdaQueryWrapper<FieldsItem>().eq(FieldsItem::getUuid, uuid));
+ for (Fields field : fields ) {
+ if (fieldsItems.isEmpty()) {
+ fileds.put(field.getFields(), null);
+ continue;
+ }
+ fieldsItems.forEach(fieldsItem -> {
+ if (fieldsItem.getFieldsId().equals(field.getId())) {
+ fileds.put(field.getFields(), fieldsItem.getValue());
+ }
+ });
+ }
+
+ }
/**
* @param template
--
Gitblit v1.9.1