From 10f65333417f064377b01a89064d2ce716603a07 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 20:19:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index a8f2c12..06ca137 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -109,6 +109,13 @@
if (CollectionUtils.isEmpty(workOrderList)) {
return Boolean.TRUE;
}
+ // 鏍规嵁鍥芥爣鐮佸幓閲�
+ workOrderList = workOrderList.stream()
+ .collect(Collectors.toMap(
+ WorkOrder::getSerialNumber,
+ p -> p,
+ (existing, replacement) -> existing // 鍐茬獊鏃朵繚鐣欑涓�涓�
+ )).values().stream().collect(Collectors.toList());
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper)
@@ -460,6 +467,9 @@
if (StringUtils.hasText(item.getErrorType())) {
item.setErrorTypeList(List.of(item.getErrorType().split(",")));
}
+ if (StringUtils.hasText(item.getImgListStr())) {
+ item.setImgList(List.of(item.getImgListStr().split(",")));
+ }
});
}
return Result.ok().data(page.getRecords()).total(page.getTotal());
@@ -684,7 +694,7 @@
imgUrl = workOrderNo + "_" + IdUtils.fastSimpleUUID() + ".png";
// 鐢熸垚鍥剧墖璺緞
- String imgPath = PlatformConfig.getUploadPath() + "/" + imgUrl;
+ String imgPath = PlatformConfig.getProfile() + "/" + imgUrl;
System.out.println("鍥剧墖淇濆瓨鍦板潃锛�" + imgPath);
imgUrl = Constants.RESOURCE_PREFIX + "/" + imgUrl;
// 淇濆瓨鍥剧墖
@@ -714,8 +724,8 @@
}
@Override
- public List<DeviceInfoVO> hasErrorWorkOrderList() {
- List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList();
+ public List<DeviceInfoVO> hasErrorWorkOrderList(Date start, Date end) {
+ List<DeviceInfoVO> list = baseMapper.hasErrorWorkOrderList(start, end);
return list;
}
--
Gitblit v1.8.0