cuilei
20 小时以前 699295ce3e0e1116d1fc20f0fae89b66613bbacf
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -221,7 +221,11 @@
            //更新设备维修状态
            eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
            //推送企业微信消息
            sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
            try {
                sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, null);
            } catch (Exception e) {
                log.error("推送企业微信消息失败:" + e.getMessage(), e);
            }
        }
    }
@@ -236,6 +240,7 @@
        String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
        eamRepairOrder.setRepairCode(codeSeq);
        EamReportRepair eamReportRepair = eamReportRepairService.getById(eamReportRepairQuery.getId());
        eamRepairOrder.setReportId(eamReportRepairQuery.getId());
        eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
        eamRepairOrder.setEquipmentId(eamReportRepair.getEquipmentId());
        eamRepairOrder.setRepairStatus(ReportRepairEnum.UNDER_REPAIR.name());
@@ -267,7 +272,11 @@
            //更新设备维修状态
            eamEquipmentExtendService.updateEquipmentRepairStatus(eamReportRepair.getEquipmentId(), EquipmentRepairStatus.UNDER_REPAIR.name());
            //推送企业微信消息
            sendQywxTemplateCardMessage(eamRepairOrder, null, null);
            try {
                sendQywxTemplateCardMessage(eamRepairOrder, null, null);
            } catch (Exception e) {
                log.error("推送企业微信消息失败:" + e.getMessage(), e);
            }
        }
    }
@@ -448,7 +457,7 @@
                        values.put("dataId", eamRepairOrder.getId());
                        values.put("organization", "维修工单进入等备件状态");
                        values.put("comment", "维修工单进入等备件状态");
                        values.put("NextAssignee", Arrays.asList(equipment.getEquipmentManager().split(",")));
                        values.put("NextAssignee", equipment.getEquipmentManager().split(","));
                        values.put("status", 1);
                        request.setComment("维修工单进入等备件状态");
                        eamRepairOrder.setRepairStatus(ReportRepairEnum.WAIT_SPARES.name());
@@ -546,7 +555,11 @@
        eamReportRepairService.updateById(eamReportRepair);
        if (!ReportRepairEnum.COMPLETE.name().equals(eamRepairOrder.getRepairStatus())) {
            //推送企业微信消息(流程完结不发送消息)
            sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
            try {
                sendQywxTemplateCardMessage(eamRepairOrder, eamReportRepair, request);
            } catch (Exception e) {
                log.error("推送企业微信消息失败:" + e.getMessage(), e);
            }
        }
        return eamRepairOrder;
    }