设备故障登记

lyh

2025-07-25 86ba6f759117d9437bcaab902efa29e8cf72c815

 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportAccidentsRegisterServiceImpl.java

@@ -129,6 +129,7 @@
            if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getEquipmentName())) {
                queryWrapper.like("e.equipment_name", eamReportAccidentsRegisterQuery.getEquipmentName());
            }
            queryWrapper.eq("aar.del_flag", CommonConstant.DEL_FLAG_0);
            //排序
            if (StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getColumn()) && StringUtils.isNotBlank(eamReportAccidentsRegisterQuery.getOrder())) {
                String column = eamReportAccidentsRegisterQuery.getColumn();
@@ -348,7 +349,7 @@
            case PENDING_REPAIR_TEAM_LEADER:
                userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0013);
                if (CollectionUtil.isEmpty(userSelectors)) {
                    throw new JeecgBootException("设备未存在维修组长，无法进入下级审批");
                    throw new JeecgBootException("设备未存在维修区长，无法进入下级审批");
                }
                userApprovalList= userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                values.put("NextAssignee", userApprovalList);
@@ -391,7 +392,7 @@
                    //维修区长拒绝
                    eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.REJECTED.name());
                }else {
                    eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_REPAIR_REGIONAL_MANAGER.name());
                    eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_TECHNICAL_RESPONSIBLE.name());
                }
                break;
            //待技术负责人处理
@@ -471,13 +472,13 @@
                throw  new JeecgBootException("审批失败");
        }
        eamReportAccidentsRegisterDto.setValues(values);
        //保存工单
        this.updateById(eamReportAccidentsRegister);
        Result result = flowTaskService.complete(eamReportAccidentsRegisterDto);
        if (!result.isSuccess()) {
            throw new JeecgBootException("审批失败，请刷新查看！");
        }
        //保存工单
        this.updateById(eamReportAccidentsRegister);
        return result;
        return Result.ok("审批成功");
    }

    private boolean claimTask(String taskId, LoginUser user) {