From c1bad050677bc636fefcc8503175db3e3c6f2496 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 24 八月 2024 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 9 ++++++++-
ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java | 3 ++-
ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java | 4 ++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java b/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java
index edc84b3..9ba2459 100644
--- a/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java
+++ b/ycl-common/src/main/java/enumeration/general/ErrorTypeEnum.java
@@ -28,7 +28,8 @@
OSD("OSD寮傚父"),
MONITORUNQUALIFY("涓�鏈轰竴妗ｄ笉鍚堟牸"),
VIDEOORPICUNNORMAL("瑙嗛鎷夋祦銆佸浘鐗囪幏鍙栧紓甯�"),
- PICUNUSEFUL("澶у浘涓嶅彲鐢�");
+ PICUNUSEFUL("澶у浘涓嶅彲鐢�"),
+ PICURLABNORMAL("鍥剧墖璁块棶寮傚父");
private final String value;
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
index 5e70608..2ccf8e2 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ReportServiceImpl.java
@@ -114,9 +114,9 @@
reports.add(entity);
});
if (saveBatch(reports)) {
- return Result.ok("瀵煎叆鎴愬姛");
+ return Result.ok("鎴愬姛瀵煎叆" + list.size() + "鏉℃暟鎹�");
}
- return Result.error("娣诲姞澶辫触");
+ return Result.error("瀵煎叆澶辫触");
}
/**
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 7b5fac5..eddf0e5 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
@@ -37,7 +37,10 @@
import com.ycl.utils.http.HttpUtils;
import com.ycl.utils.redis.RedisCache;
import com.ycl.utils.uuid.IdUtils;
-import enumeration.general.*;
+import enumeration.general.NotifyTypeEnum;
+import enumeration.general.UrgentLevelEnum;
+import enumeration.general.WorkOrderDistributeWayEnum;
+import enumeration.general.WorkOrderStatusEnum;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
@@ -211,7 +214,9 @@
}
// 濡傛灉鏄洿鎺ヤ笅鍙戯紝娣诲姞涓嬪彂璁板綍
if (WorkOrderStatusEnum.DISTRIBUTED.equals(waitAddList.get(0).getStatus())) {
+ ArrayList<String> list = new ArrayList<>();
List<WorkOrderDistributeRecord> distributedRecordList = waitAddList.stream().map(item -> {
+ list.add(item.getSerialNumber());
WorkOrderDistributeRecord workOrderDistributeRecord = new WorkOrderDistributeRecord();
workOrderDistributeRecord.setWorkOrderNo(item.getWorkOrderNo());
workOrderDistributeRecord.setDistributeWay(WorkOrderDistributeWayEnum.DIRECT_DISTRIBUTE);
@@ -221,6 +226,8 @@
return workOrderDistributeRecord;
}).collect(Collectors.toList());
workOrderDistributeRecordMapper.insertBatch(distributedRecordList);
+ // 鍚屾鐐逛綅鐘舵��
+ ywPointService.updateRecovery(list, 1);
}
log.info("浼犲叆宸ュ崟鎬绘暟: {}锛屽疄闄呮坊鍔犲伐鍗曟暟锛歿}, 瀹為檯淇敼宸ュ崟鏁帮細{}", total, waitAddList.size(), updateNum);
return Boolean.TRUE;
--
Gitblit v1.8.0