From 23fc1a4a8de125d8bee6fc602e767a5310b89f3e Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 07 四月 2025 17:34:08 +0800
Subject: [PATCH] 新设备品牌名,通道问题，
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 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 45b302c..e16d539 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
@@ -536,7 +536,7 @@
ywPointService.updateRecovery(serialNumbers, 0);
//绛涢�夊嚭绂荤嚎宸ュ崟ip骞朵慨鏀瑰湪绾跨姸鎬�
if (!CollectionUtils.isEmpty(serialNumbers)) {
- Map<String, List<String>> errorTypes = workOrderErrorTypeMapper.getErrorListByNumbers(serialNumbers).stream().collect(Collectors.groupingBy(
+ Map<String, List<String>> errorTypes = workOrderErrorTypeMapper.getErrorListByNumbers(workOrderNoList).stream().collect(Collectors.groupingBy(
WorkOrderVO::getIp,
Collectors.mapping(
WorkOrderVO::getErrorType,
@@ -1166,6 +1166,9 @@
return Result.ok().data(workOrder);
}
+ @Autowired
+ private WorkOrderMapper workOrderMapper;
+
/**
* 宸ュ崟瀵煎嚭鐨勯�昏緫
* 鏍囩锛氬悓涓�涓猧p鏍囩鍚堝湪涓�璧凤紝閽堝绂荤嚎宸ュ崟锛坕p鐩稿悓灏变笉浼氱敓鎴愬伐鍗曪級锛屾柟渚胯繍缁村鐞�
@@ -1195,6 +1198,30 @@
query.setErrorTypeList(errorTypeList);
}
List<WorkOrderVO> export = baseMapper.export(query);
+
+
+ List<String> workOrderNos = export.stream().map(WorkOrderVO::getWorkOrderNo).collect(Collectors.toList());
+ List<WorkOrderVO> auditTimeList = workOrderMapper.getAuditTimeList(workOrderNos);
+ Map<String, List<Date>> auditTimeMap = auditTimeList.stream()
+ .collect(Collectors.groupingBy(
+ WorkOrderVO::getWorkOrderNo, // 鍒嗙粍鐨勯敭
+ Collectors.mapping(WorkOrderVO::getAuditTime, Collectors.toList())));
+ if (!CollectionUtils.isEmpty(workOrderNos)){
+ export.forEach(workOrderVO -> {
+ List<Date> auditTimes = auditTimeMap.get(workOrderVO.getWorkOrderNo());
+ if (!CollectionUtils.isEmpty(auditTimes)){
+ //瀹℃牳閫氳繃鏃堕棿
+ Date passTime = Collections.max(auditTimes);
+ ZoneId zoneId = ZoneId.systemDefault();
+ workOrderVO.setPassTime(passTime.toInstant().atZone(zoneId).toLocalDateTime());
+ }
+ });
+ }
+
+
+
+
+
if (CollectionUtils.isEmpty(export)) return new ArrayList<WorkOrderVO>();
List<String> ips = export.stream().map(WorkOrderVO::getIp).collect(Collectors.toList());
//鏌ュ嚭鐩稿悓ip鐨勮澶囥�佸苟鏌ュ嚭鏍囩
--
Gitblit v1.8.0