From 23396e93588f52941f729fc63cea84a70847d3bc Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 11 九月 2025 11:08:12 +0800
Subject: [PATCH] 二保三保设备保养时间调整

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
index b7c322d..ae2157c 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentExtendServiceImpl.java
@@ -1,14 +1,16 @@
 package org.jeecg.modules.eam.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
 import org.jeecg.modules.eam.entity.EamEquipmentExtend;
 import org.jeecg.modules.eam.mapper.EamEquipmentExtendMapper;
 import org.jeecg.modules.eam.service.IEamEquipmentExtendService;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Objects;
 
 /**
  * @Description: 璁惧鍙拌处鎵╁睍琛�
@@ -24,12 +26,22 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public boolean updateEquipmentMaintenanceStatus(String equipmentId, String status) {
+    public boolean updateEquipmentMaintenanceStatus(String equipmentId, String status, String maintenanceCategory, Date date) {
         EamEquipmentExtend entity = eamEquipmentExtendMapper.selectById(equipmentId);
         if (entity == null) {
             return false;
         }
+
         entity.setMaintenanceStatus(status);
+        if (Objects.nonNull(date)) {
+            if (MaintenanceCategoryEnum.SECOND_MAINTENANCE.name().equals(maintenanceCategory)) {
+                entity.setLatestSecondMaintenance(new Date());
+                entity.setNextSecondMaintenance(date);
+            }else if (MaintenanceCategoryEnum.THIRD_MAINTENANCE.name().equals(maintenanceCategory)) {
+                entity.setLatestThirdMaintenance(new Date());
+                entity.setNextThirdMaintenance(date);
+            }
+        }
         eamEquipmentExtendMapper.updateById(entity);
         return true;
     }

--
Gitblit v1.9.3