From 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 02 三月 2026 17:04:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
index 2394982..b0e9c0d 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -10,7 +10,6 @@
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.DeviceDefectRecordService;
-import com.ruoyi.device.service.IDeviceRepairService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -53,10 +52,9 @@
public boolean updateByDDR(DeviceDefectRecord deviceDefectRecord) {
String status = deviceDefectRecord.getStatus();
if (status.equals("涓ラ噸缂洪櫡")) {
-// deviceDefectRecord.setStatus("姝ｅ父");
-// deviceDefectRecord.setEliminateTime(LocalDateTime.now());
throw new RuntimeException("涓ラ噸缂洪櫡-璁惧缁翠慨鍚庢洿鏂颁负姝ｅ父鐘舵��");
- } else if (status.equals("涓�鑸己闄�")) {
+ }
+ if (status.equals("涓�鑸己闄�")) {
deviceDefectRecord.setStatus("姝ｅ父");
}
deviceDefectRecord.setEliminateTime(LocalDateTime.now());
--
Gitblit v1.9.3