From 2b35183407eb7b1b1524f7b101f1098d9caea042 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 02 四月 2025 15:13:24 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/common/utils/FieldsUtils.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 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 0f7f8ae..ea9f543 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
@@ -80,7 +80,7 @@
* @description 鍔ㄦ�佸瓧娈祐alue淇濆瓨
* @time 2025/3/18 15:00
*/
- public static void saveFields(Map<String, ?> template, String uuid) {
+ public static void saveFields(Map<String, ?> template, String uuid) throws Exception{
List<Fields> fields = getFieldsSta();
FieldsItemService fieldsItemService = SpringUtils.getBean(FieldsItemService.class);
if (fields.isEmpty()) {
@@ -110,7 +110,7 @@
return fieldsService.list(new LambdaQueryWrapper<Fields>().eq(Fields::getStatus, 1).eq(Fields::getFlagEnable, 1));
}
- public static void updateFieldsValue(Map<String, Object> params) {
+ public static void updateFieldsValue(Map<String, Object> params) throws Exception{
List<Fields> fields = getFieldsSta();
if (fields.isEmpty()) { return; }
Object fieldsIndex = params.get("fieldsIndex");
@@ -118,9 +118,7 @@
String index = fieldsIndex.toString();
FieldsItemService fieldsItemService = SpringUtils.getBean(FieldsItemService.class);
for (Fields field : fields) {
- Map<String, String> extendFields = (Map<String, String>) params.get("extendFields");
- if (!Objects.isNull(extendFields)) {
- if (!Objects.isNull(extendFields.get(field.getFields()))) {
+ if (!Objects.isNull(params.get(field.getFields()))) {
FieldsItem indexItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>()
.eq(FieldsItem::getUuid, index)
.eq(FieldsItem::getFieldsId, field.getId()));
@@ -129,22 +127,20 @@
FieldsItem item = new FieldsItem();
item.setUuid(index)
.setFieldsId(field.getId())
- .setValue(extendFields.get(field.getFields()).toString());
+ .setValue(params.get(field.getFields()).toString());
if (!fieldsItemService.save(item)) {
throw new CoolException("鎵╁睍瀛楁淇敼澶辫触锛侊紒");
}
} else {
- indexItem.setValue(extendFields.get(field.getFields()).toString());
+ indexItem.setValue(params.get(field.getFields()).toString());
if (!fieldsItemService.updateById(indexItem)) {
throw new CoolException("鎵╁睍瀛楁淇敼澶辫触锛侊紒");
}
}
}
- }
}
} else {
- String uuid16 = CommonUtil.randomUUID16();
- saveFields(params, uuid16);
+ saveFields(params, params.get("index").toString());
}
}
}
--
Gitblit v1.9.1