From ba4a73717339424325a8f82d0f10ec22aec1aad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 12 四月 2025 10:12:39 +0800
Subject: [PATCH] #新增 1. 修改不良品组拖功能 2. 新装车不良品获取
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
index d2a1173..5293829 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/DeviceSite.java
@@ -198,7 +198,26 @@
DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_TASK_TYPE)
- .in(DictData::getId, asList));
+ .in(DictData::getValue, asList));
+ if (dictDatas.isEmpty()) {
+ return null;
+ }
+ List<String> strings = dictDatas.stream().map(DictData::getLabel).collect(Collectors.toList());
+
+ return StringUtils.join(strings, ",");
+ }
+
+ public String getDevice$(){
+ if (null == this.device){ return null; }
+ String[] split = this.device.split(",");
+ List<String> asList = Arrays.asList(split);
+ if (asList.isEmpty()) {
+ return null;
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ List<DictData> dictDatas = dictDataService.list(new LambdaQueryWrapper<DictData>()
+ .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_DEVICE_TYPE)
+ .in(DictData::getValue, asList));
if (dictDatas.isEmpty()) {
return null;
}
--
Gitblit v1.9.1