维修流程处理

Lius

2025-04-21 5fad000e32ddbebcf83faae0cb57c5005734fe33

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

@@ -9,11 +9,9 @@
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.entity.EamEquipment;
import org.jeecg.modules.eam.entity.EamEquipmentHistoryLog;
import org.jeecg.modules.eam.entity.EamInspectionOrder;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IEamEquipmentHistoryLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -86,7 +84,7 @@
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getOperator());
                        log.setDescription(order.getConfirmComment());
                        log.setCreateTime(order.getInspectionDate());
                        log.setCreateTime(order.getOperateTime());
                    }
                }
                break;
@@ -107,8 +105,26 @@
            case THIRD_MAINTENANCE:
                break;
            case REPORT_REPAIR:
                if (result instanceof EamReportRepair) {
                    EamReportRepair repair = (EamReportRepair) result;
                    log.setEquipmentId(repair.getEquipmentId());
                    log.setBusinessId(repair.getId());
                    log.setOperator(repair.getCreateBy());
                    log.setDescription(repair.getFaultDescription());
                    log.setCreateTime(repair.getFaultStartTime());
                }
                break;
            case REPAIRED:
                if (result instanceof EamRepairOrder) {
                    EamRepairOrder order = (EamRepairOrder) result;
                    if (ReportRepairEnum.COMPLETE.name().equals(order.getRepairStatus())) {
                        log.setEquipmentId(order.getEquipmentId());
                        log.setBusinessId(order.getId());
                        log.setOperator(order.getRepairer());
                        log.setDescription(order.getRepairDescription());
                        log.setCreateTime(order.getActualEndTime());
                    }
                }
                break;
            case MAJOR_REPAIR:
                break;