Lius
2025-04-22 184ab4ca30a50a43b4626fea9ade52024380a3de
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -188,7 +188,7 @@
            throw new JeecgBootException("设备不存在,请检查!");
        }
        ReportRepairEnum status = ReportRepairEnum.getInstance(request.getRepairStatus());
        ReportRepairEnum status = ReportRepairEnum.getInstance(eamRepairOrder.getRepairStatus());
        if (status == null) {
            return null;
        }
@@ -197,7 +197,7 @@
        switch (status) {
            case UNDER_REPAIR:
                //维修中:下一步 判断是否需要备件, 需要备件转设备管理员领用备件, 不需要则转到设备报修员确认维修完成
                if (request.getStatus() == 1) {
                if (request.getIsUseSpare() == 1) {
                    // 需要
                    List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0004);
                    if (CollectionUtil.isEmpty(userSelectors)) {
@@ -217,7 +217,7 @@
                    values.put("dataId", eamRepairOrder.getId());
                    values.put("organization", "维修工单进入报修员确认阶段");
                    values.put("comment", "维修工单进入报修员确认阶段");
                    values.put("NextAssignee", eamReportRepair.getCreateBy());
                    values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
                    values.put("status", 0);
                    request.setComment("维修工单进入报修员确认阶段");
                    eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_CONFIRM.name());
@@ -245,7 +245,7 @@
                values.put("dataId", eamRepairOrder.getId());
                values.put("organization", "维修工单进入维修员继续维修阶段");
                values.put("comment", "维修工单进入维修员继续维修阶段");
                values.put("NextAssignee", eamRepairOrder.getRepairer());
                values.put("NextAssignee", Arrays.asList(eamRepairOrder.getRepairer().split(",")));
                values.put("status", 0);
                request.setComment("维修工单进入维修员继续维修阶段");
                eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
@@ -257,7 +257,7 @@
                values.put("dataId", eamRepairOrder.getId());
                values.put("organization", "维修工单流程结束");
                values.put("comment", "维修工单流程结束");
                values.put("NextAssignee", eamReportRepair.getCreateBy());
                values.put("NextAssignee", Arrays.asList(eamReportRepair.getCreateBy().split(",")));
                values.put("status", 0);
                request.setComment("维修工单进入报修员确认阶段");
                eamRepairOrder.setRepairStatus(ReportRepairEnum.COMPLETE.name());