From 7e39aba8980b95fac3b347689aac66da41079d18 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 22:41:38 +0800
Subject: [PATCH] 报备功能优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 06ca137..767691e 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
@@ -118,11 +118,14 @@
)).values().stream().collect(Collectors.toList());
List<String> serialNumberList = workOrderList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
// 鏌ュ嚭鏁版嵁搴撲腑鍥芥爣鐮佸搴旂殑鏈畬鎴愮殑宸ュ崟
- List<WorkOrder> inDatabaseWorkOrderList = new LambdaQueryChainWrapper<>(baseMapper)
- .select(WorkOrder::getId, WorkOrder::getSerialNumber, WorkOrder::getStatus, WorkOrder::getWorkOrderNo)
- .in(WorkOrder::getSerialNumber, serialNumberList)
- .ne(WorkOrder::getStatus, WorkOrderStatusEnum.AUDITING_SUCCESS)
- .list();
+ List<WorkOrder> inDatabaseWorkOrderList = baseMapper.getNotFinishedWorkOrders(serialNumberList);
+ inDatabaseWorkOrderList.stream().forEach(item -> {
+ if (StringUtils.hasText(item.getErrorType())) {
+ item.setErrorTypeList(List.of(item.getErrorType().split(",")));
+ } else {
+ item.setErrorTypeList(new ArrayList<>(1));
+ }
+ });
Map<String, WorkOrder> mapping = inDatabaseWorkOrderList.stream().collect((Collectors.toMap(WorkOrder::getSerialNumber, workOrder -> workOrder)));
List<WorkOrder> waitAddList = new ArrayList<>(48);
List<WorkOrderErrorType> waitAddErrorTypeList = new ArrayList<>(48);
@@ -137,7 +140,7 @@
for (WorkOrder workOrder : workOrderList) {
WorkOrder databaseWorkOrder = mapping.get(workOrder.getSerialNumber());
if (Objects.nonNull(databaseWorkOrder)) {
- List<String> errorNameList = workOrderErrorTypeService.getBaseMapper().getNotFinishWorkOrderErrors(databaseWorkOrder.getWorkOrderNo());
+ List<String> errorNameList = databaseWorkOrder.getErrorTypeList();
List<String> errorTypes = workOrder.getErrorTypeList();
if (errorNameList.containsAll(errorTypes)) {
// 濡傛灉锛屽浗鏍囩爜銆佹晠闅滅被鍨嬮兘涓�鏍凤紝鍒欒烦杩囦笉澶勭悊
@@ -489,9 +492,6 @@
LocalDateTime now = LocalDateTime.now(ZoneId.systemDefault());
data.setEnd(now);
switch (data.getFastWay()) {
- case LAST_HALF_HOUR:
- data.setStart(now.minusMinutes(30));
- break;
case LAST_HOUR:
data.setStart(now.minusHours(1));
break;
@@ -501,8 +501,12 @@
case LAST_DAY:
data.setStart(now.minusDays(1));
break;
+ default:
+ break;
}
-
+ if (Objects.isNull(data.getStart())) {
+ throw new RuntimeException("鏃犳硶鐢熸垚蹇�熶笅鍙戠殑鏃堕棿鑼冨洿锛岃閫夋嫨姝ｇ‘鐨勫揩閫熶笅鍙戞柟寮�");
+ }
// 鏌ヨ绗﹀悎鏉′欢鐨勫伐鍗�
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
.select(WorkOrder::getSerialNumber, WorkOrder::getWorkOrderNo)
--
Gitblit v1.8.0