Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-27 92bc6dca274eb45dc330f63b5a3f90a01458e157

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/aspect/EquipmentHistoryLogAspect.java

@@ -7,10 +7,7 @@
import org.aspectj.lang.annotation.*;
import org.aspectj.lang.reflect.MethodSignature;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
import org.jeecg.modules.eam.constant.ReportRepairEnum;
import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.constant.*;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IEamEquipmentHistoryLogService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -139,6 +136,16 @@
            case UNSEALED:
                break;
            case TRANSFERRED:
                if (result instanceof EamEquipmentTransfer) {
                    EamEquipmentTransfer order = (EamEquipmentTransfer) result;
                    if (EquipmentTransferStatusEnum.COMPLETE.name().equals(order.getTransferStatus())) {
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getReportUser());
                        log.setDescription(order.getTransferReason());
                        log.setCreateTime(order.getTransferTime());
                    }
                }
                break;
            case SCRAPPED:
                break;