Merge remote-tracking branch 'origin/master'

lyh

3 天以前 58f63d0e061123b15f780d294272d8a461f183db

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

@@ -251,6 +251,8 @@
            variables.put("organization", applyReasonTypeText);
            variables.put("comment", applyReasonTypeText);
        }
        variables.put("proofreading", true);
        variables.put("NextAssignee", userApprovalList);
        Result<?> result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_change", variables);
        if(result == null || !result.isSuccess()) {
            throw new JeecgBootException("启动流程失败！");
@@ -300,13 +302,13 @@
        }

        // 设置流程变量
        setupProcessVariables(request, order, user, equipment);
        setupProcessVariables(request, entity, user, equipment);

        // 完成流程任务
        Result result = flowTaskService.complete(request);

        // 根据任务完成结果更新工单状态
        updateOrderStatus(result, request, order, user);
        updateOrderStatus(result, request, entity, order, user);

        //更新工单信息
        this.getBaseMapper().updateById(entity);
@@ -316,15 +318,168 @@
    /**
     * 设置流程变量
     */
    private void setupProcessVariables(EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user, EamEquipment equipment) {
    private void setupProcessVariables(EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceChange entity, LoginUser user, EamEquipment equipment) {
        //流程变量
        Map<String, Object> values = new HashMap<>();
        List<String> userApprovalList;
        List<UserSelector> userSelectors;
        ThirdMaintenanceChangeStatusEnum status = ThirdMaintenanceChangeStatusEnum.getInstance(entity.getChangeStatus());
        switch (status) {
            case EQUIPMENT_MANAGER_SIGNING:
                // 使用单位主管室级领导审核
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getEquipmentManagerComment())) {
                    values.put("organization", "三保工单变更使用单位主管室级领导");
                    values.put("comment", "三保工单变更使用单位主管室级领导");
                    request.setComment("三保工单变更部门领导审核");
                } else {
                    values.put("organization", request.getEquipmentManagerComment());
                    values.put("comment", request.getEquipmentManagerComment());
                    request.setComment(request.getEquipmentManagerComment());
                }
                if (BusinessCodeConst.APPROVED.equals(request.getEquipmentManagerSignatureResult())) {
                    values.put("confirmation", request.getEquipmentManagerSignatureResult());
                    ThirdMaintenanceChangeReasonEnum applyReasonType = ThirdMaintenanceChangeReasonEnum.getInstance(request.getApplyReasonType());
                    switch (applyReasonType) {
                        case PRODUCTION_WORK_ORDER_EXPEDITED:
                            //生产任务
                            userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0012);
                            if (CollectionUtil.isEmpty(userSelectors)) {
                                throw new JeecgBootException("设备未分配给生产指挥部室级领导，无法进入下级审批！");
                            }
                            break;
                        case EQUIPMENT_BREAKDOWN_REPAIR:
                            //设备故障
                            userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0013);
                            if (CollectionUtil.isEmpty(userSelectors)) {
                                throw new JeecgBootException("设备未分配给维修区长，无法进入下级审批！");
                            }
                            break;
                        case EQUIPMENT_SCRAPPED:
                            //设备报废
                            userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0014);
                            if (CollectionUtil.isEmpty(userSelectors)) {
                                throw new JeecgBootException("设备未分配给资产管理部，无法进入下级审批！");
                            }
                            break;
                        case EQUIPMENT_MAJOR:
                            //设备大修、项修
                            userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0016);
                            if (CollectionUtil.isEmpty(userSelectors)) {
                                throw new JeecgBootException("设备未分配给运维商务室主任，无法进入下级审批！");
                            }
                            break;
                        case EQUIPMENT_RETROFITTING:
                            //设备搬迁、改造
                            userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0015);
                            if (CollectionUtil.isEmpty(userSelectors)) {
                                throw new JeecgBootException("设备未分配给项目主管部，无法进入下级审批！");
                            }
                            break;
                        default:
                            throw new JeecgBootException("变更申请原因无法识别，审批失败！");
                    }
                    userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                    values.put("NextAssignee", userApprovalList);
                } else {
                    values.put("confirmation", request.getEquipmentManagerSignatureResult());
                }
                break;
            case DEPART_MANAGER_SIGNING:
                //部门领导审核
                values.put("confirmation", request.getDepartManagerSignatureResult());
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getDepartManagerComment())) {
                    values.put("organization", "三保工单变更部门领导审核");
                    values.put("comment", "三保工单变更部门领导审核");
                    request.setComment("三保工单变更部门领导审核");
                } else {
                    values.put("organization", request.getDepartManagerComment());
                    values.put("comment", request.getDepartManagerComment());
                    request.setComment(request.getDepartManagerComment());
                }
                if (BusinessCodeConst.APPROVED.equals(request.getDepartManagerSignatureResult())) {
                    // 获取下一步执行人
                    userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0017);
                    if (CollectionUtil.isEmpty(userSelectors)) {
                        throw new JeecgBootException("设备未分配给运维管理室室主任，无法进入下级审批！");
                    }
                    userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
                    values.put("NextAssignee", userApprovalList);

                } else {
                    values.put("confirmation", request.getDepartManagerSignatureResult());
                }
                break;
            case PRODUCTION_SUPPORT_SIGNING:
                // 维修室主任签字
                values.put("dataId", entity.getId());
                if(StringUtils.isBlank(request.getDepartManagerComment())) {
                    values.put("organization", "三保工单变更生产保障部审核");
                    values.put("comment", "三保工单变更生产保障部审核");
                    request.setComment("三保工单变更生产保障部审核");
                } else {
                    values.put("organization", request.getProductionSupportComment());
                    values.put("comment", request.getProductionSupportComment());
                    request.setComment(request.getProductionSupportComment());
                }
                break;
        }
        request.setValues(values);
    }

    /**
     * 更新工单状态
     */
    private void updateOrderStatus(Result result, EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user) {

    private void updateOrderStatus(Result result, EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceChange entity, EamThirdMaintenanceOrder order, LoginUser user) {
        if (result.isSuccess()) {
            ThirdMaintenanceChangeStatusEnum status = ThirdMaintenanceChangeStatusEnum.getInstance(entity.getChangeStatus());
            switch (status) {
                case EQUIPMENT_MANAGER_SIGNING:
                    // 设置entity
                    entity.setEquipmentManagerSignature(user.getUsername());
                    entity.setEquipmentManagerSignatureTime(new Date());
                    entity.setEquipmentManagerComment(request.getEquipmentManagerComment());
                    entity.setEquipmentManagerSignatureResult(request.getEquipmentManagerSignatureResult());
                    if(BusinessCodeConst.APPROVED.equals(request.getEquipmentManagerSignatureResult())) {
                        //通过
                        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.DEPART_MANAGER_SIGNING.name());
                    } else {
                        //驳回
                        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.REJECTED.name());
                    }
                    break;
                case DEPART_MANAGER_SIGNING:
                    entity.setDepartManagerSignature(user.getUsername());
                    entity.setDepartManagerSignatureTime(new Date());
                    entity.setDepartManagerComment(request.getDepartManagerComment());
                    entity.setDepartManagerSignatureResult(request.getDepartManagerSignatureResult());
                    if(BusinessCodeConst.APPROVED.equals(request.getDepartManagerSignatureResult())) {
                        // 通过
                        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.PRODUCTION_SUPPORT_SIGNING.name());
                    } else {
                        //驳回
                        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.REJECTED.name());
                    }
                    break;
                case PRODUCTION_SUPPORT_SIGNING:
                    entity.setProductionSupportSignature(user.getUsername());
                    entity.setProductionSupportSignatureTime(new Date());
                    entity.setProductionSupportSignatureResult(request.getProductionSupportSignatureResult());
                    entity.setProductionSupportComment(request.getProductionSupportComment());
                    if(BusinessCodeConst.APPROVED.equals(request.getProductionSupportSignatureResult())) {
                        //通过
                        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.COMPLETED.name());
                        order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
                        order.setMaintenanceDate(entity.getDeferredMaintenanceDate());
                        thirdMaintenanceOrderService.updateById(order);
                    }else {
                        //驳回
                        entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.REJECTED.name());
                    }
                    break;
            }
        }
    }

    private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {