From a7dd93b840bdce4bd0011bc948157f440514a207 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 28 四月 2026 16:36:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 a14b2c6..3741de4 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -6,11 +6,11 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.mapper.DeviceDefectRecordMapper;
+import com.ruoyi.device.mapper.DeviceRepairMapper;
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 lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -19,12 +19,10 @@
@Service
@Transactional(rollbackFor = Exception.class)
+@RequiredArgsConstructor
public class DeviceDefectRecordServiceImpl extends ServiceImpl<DeviceDefectRecordMapper, DeviceDefectRecord> implements DeviceDefectRecordService {
- @Autowired
- private DeviceDefectRecordMapper deviceDefectRecordMapper;
-
- @Autowired
- private IDeviceRepairService deviceRepairService;
+ private final DeviceDefectRecordMapper deviceDefectRecordMapper;
+ private final DeviceRepairMapper deviceRepairMapper;
@Override
public IPage<DeviceDefectRecordDto> listPage(Page page, DeviceDefectRecordDto deviceDefectRecordDto) {
@@ -40,7 +38,7 @@
//鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
deviceRepair.setRepairName(SecurityUtils.getUsername());
deviceRepair.setRepairTime(new Date());
- deviceRepairService.saveDeviceRepair(deviceRepair);
+ deviceRepairMapper.insert(deviceRepair);
return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
} else if (status.equals("涓�鑸己闄�")) {
return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
--
Gitblit v1.9.3