设备维修流程小问题处理

cuilei

2 天以前 5f9fcf24d144e8790cc0a91138e5c4f16c03dbae

 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);
            }
        }
    }

@@ -287,7 +296,6 @@
            List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
            String nextAssigneeStr = nextAssignee.stream()
                    .filter(Objects::nonNull) // 可选：过滤 null 值
                    .map(item -> item.substring(2))//设备台账表维护的设备管理员工号是带 WK前缀的
                    .collect(Collectors.joining(","));
            String touser = wechatEnterpriseService.getTouser(nextAssigneeStr, false);
            templateCard.setTouser(touser);
@@ -547,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;
    }