From 113cd73922b9b67c261c19c744e46eb2822d7b41 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 14 十一月 2025 14:54:11 +0800
Subject: [PATCH] Merge branch 'prod' into dev_tide
---
src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 67 insertions(+), 0 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
new file mode 100644
index 0000000..2394982
--- /dev/null
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceDefectRecordServiceImpl.java
@@ -0,0 +1,67 @@
+package com.ruoyi.device.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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 org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class DeviceDefectRecordServiceImpl extends ServiceImpl<DeviceDefectRecordMapper, DeviceDefectRecord> implements DeviceDefectRecordService {
+ @Autowired
+ private DeviceDefectRecordMapper deviceDefectRecordMapper;
+
+ @Autowired
+ private DeviceRepairMapper deviceRepairMapper;
+
+ @Override
+ public IPage<DeviceDefectRecordDto> listPage(Page page, DeviceDefectRecordDto deviceDefectRecordDto) {
+ return deviceDefectRecordMapper.listPage(page, deviceDefectRecordDto);
+ }
+ @Override
+ public boolean add(DeviceDefectRecord deviceDefectRecord) {
+ String status = deviceDefectRecord.getStatus();
+ if (status.equals("涓ラ噸缂洪櫡")) {
+ DeviceRepair deviceRepair = new DeviceRepair();
+ deviceRepair.setDeviceLedgerId(deviceDefectRecord.getDeviceLedgerId());
+ deviceRepair.setRemark(deviceDefectRecord.getDefectDescription());
+ //鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛
+ deviceRepair.setRepairName(SecurityUtils.getUsername());
+ deviceRepair.setRepairTime(new Date());
+ deviceRepairMapper.insert(deviceRepair);
+ return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
+ } else if (status.equals("涓�鑸己闄�")) {
+ return deviceDefectRecordMapper.insert(deviceDefectRecord) > 0;
+ }
+ return false;
+ }
+
+ @Override
+ 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("涓�鑸己闄�")) {
+ deviceDefectRecord.setStatus("姝ｅ父");
+ }
+ deviceDefectRecord.setEliminateTime(LocalDateTime.now());
+ return updateById(deviceDefectRecord);
+ }
+
+
+}
--
Gitblit v1.9.3