From e772b3d8cf395e9d441419373d883601350fbf0b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 17 六月 2026 16:19:09 +0800
Subject: [PATCH] 设备保养内容字段增加
---
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index 803450a..0190984 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -45,6 +45,11 @@
private final FileUtil fileUtil;
private final ISysNoticeService sysNoticeService;
+ private static final int STATUS_PENDING_MAINTENANCE = 0;
+ private static final int STATUS_COMPLETED = 1;
+ private static final int STATUS_FAILED = 2;
+ private static final int STATUS_PENDING_ACCEPTANCE = 3;
+
@Override
public IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto) {
@@ -81,6 +86,12 @@
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
deviceMaintenance.setAreaId(byId.getAreaId());
+ }
+ if (deviceMaintenance.getStatus() != null
+ && deviceMaintenance.getStatus() == STATUS_COMPLETED
+ && (oldDeviceMaintenance.getStatus() == null
+ || oldDeviceMaintenance.getStatus() != STATUS_COMPLETED)) {
+ return AjaxResult.error("璇峰厛鎻愪氦楠屾敹瀹℃壒锛岄獙鏀堕�氳繃鍚庢墠鍙畬缁�");
}
// 澶勭悊澶囦欢浣跨敤鎯呭喌
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
@@ -156,4 +167,56 @@
vo.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.DEVICE_MAINTENANCE, id));
return vo;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult confirmMaintenance(DeviceMaintenanceDto deviceMaintenanceDto) {
+ DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenanceDto.getId());
+ if (oldDeviceMaintenance == null) {
+ return AjaxResult.error("淇濆吇璁板綍涓嶅瓨鍦�");
+ }
+ if (oldDeviceMaintenance.getStatus() != null && oldDeviceMaintenance.getStatus() == STATUS_COMPLETED) {
+ return AjaxResult.error("璇ヤ繚鍏诲凡瀹岀粨锛屼笉鑳介噸澶嶇‘璁や繚鍏�");
+ }
+ if (oldDeviceMaintenance.getStatus() != null && oldDeviceMaintenance.getStatus() == STATUS_PENDING_ACCEPTANCE) {
+ return AjaxResult.error("璇ヤ繚鍏诲凡鎻愪氦楠屾敹瀹℃壒");
+ }
+ deviceMaintenanceDto.setStatus(STATUS_PENDING_ACCEPTANCE);
+ return updateDeviceDeviceMaintenance(deviceMaintenanceDto);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public AjaxResult approveMaintenanceAcceptance(DeviceMaintenanceDto deviceMaintenanceDto) {
+ if (deviceMaintenanceDto.getId() == null) {
+ return AjaxResult.error("淇濆吇璁板綍id涓嶈兘涓虹┖");
+ }
+ DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenanceDto.getId());
+ if (oldDeviceMaintenance == null) {
+ return AjaxResult.error("淇濆吇璁板綍涓嶅瓨鍦�");
+ }
+ if (oldDeviceMaintenance.getStatus() == null || oldDeviceMaintenance.getStatus() != STATUS_PENDING_ACCEPTANCE) {
+ return AjaxResult.error("璇ヤ繚鍏绘湭杩涘叆寰呴獙鏀剁姸鎬侊紝涓嶈兘瀹℃壒");
+ }
+ if (StringUtils.isBlank(deviceMaintenanceDto.getAcceptanceName())) {
+ return AjaxResult.error("楠屾敹浜轰笉鑳戒负绌�");
+ }
+ if (deviceMaintenanceDto.getAcceptanceTime() == null) {
+ return AjaxResult.error("楠屾敹鏃堕棿涓嶈兘涓虹┖");
+ }
+ if (StringUtils.isBlank(deviceMaintenanceDto.getAcceptanceRemark())) {
+ return AjaxResult.error("楠屾敹澶囨敞涓嶈兘涓虹┖");
+ }
+
+ DeviceMaintenance update = new DeviceMaintenance();
+ update.setId(deviceMaintenanceDto.getId());
+ update.setAcceptanceName(deviceMaintenanceDto.getAcceptanceName());
+ update.setAcceptanceTime(deviceMaintenanceDto.getAcceptanceTime());
+ update.setAcceptanceRemark(deviceMaintenanceDto.getAcceptanceRemark());
+ update.setStatus(STATUS_COMPLETED);
+ if (this.updateById(update)) {
+ return AjaxResult.success();
+ }
+ return AjaxResult.error("楠屾敹瀹℃壒澶辫触");
+ }
}
--
Gitblit v1.9.3