Merge remote-tracking branch 'origin/master'

Houjie

2025-07-09 777162c6adf6e923611669aa9cc51b3ad71a90a3

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

@@ -302,7 +302,7 @@

        if (ReportRepairEnum.UNDER_REPAIR.name().equals(repairStatus)) {
            if (Objects.isNull(reportRepair) && Objects.isNull(request)) {
                templateCardEntity.setSub_title_text("收到指派维修工单: " + eamRepairOrder.getRepairCode() + " 请开始进行维修");
                templateCardEntity.setSub_title_text("收到指派工单: " + eamRepairOrder.getRepairCode() + " 请开始进行维修");
            } else if (Objects.isNull(request)) {
                templateCardEntity.setSub_title_text("已领取维修工单: " + eamRepairOrder.getRepairCode() + " 开始进行维修");
            }
@@ -344,42 +344,32 @@
            horizontalContentList.add(content4);
        }

        TemplateCardEntity.HorizontalContent content5 = new TemplateCardEntity.HorizontalContent();
        TemplateCardEntity.HorizontalContent content6 = new TemplateCardEntity.HorizontalContent();

        if (ReportRepairEnum.UNDER_REPAIR.name().equals(repairStatus)) {
            TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
            SysUser sysUser = sysUserService.getUserByName(eamRepairOrder.getRepairer());
            if (Objects.isNull(reportRepair) && Objects.isNull(request)) {
                content5.setKeyname("指派人");
                content3.setKeyname("指派人");
                SysUser assignUser = sysUserService.getUserByName(eamRepairOrder.getCreateBy());
                content5.setValue(assignUser.getRealname());
                horizontalContentList.add(content5);
                content3.setValue(assignUser.getRealname());
                horizontalContentList.add(content3);
            } else if (Objects.isNull(request)) {
                TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
                content.setKeyname("领取人");
                content.setValue(sysUser.getRealname());
                horizontalContentList.add(content);
            } else {
                content5.setKeyname("备件领取人");
                content3.setKeyname("备件领取人");
                SysUser assignUser = sysUserService.getUserByName(request.getAssignee());
                content5.setValue(assignUser.getRealname());
                horizontalContentList.add(content5);
                content3.setValue(assignUser.getRealname());
                horizontalContentList.add(content3);
            }
            content6.setKeyname("维修人");
            content6.setValue(sysUser.getRealname());
            horizontalContentList.add(content6);
        }
        if (ReportRepairEnum.WAIT_SPARES.name().equals(repairStatus) || ReportRepairEnum.WAIT_CONFIRM.name().equals(repairStatus)) {
            content5.setKeyname("维修人");
            TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
            content3.setKeyname("维修人");
            SysUser repairUser = sysUserService.getUserByName(eamRepairOrder.getRepairer());
            content5.setValue(repairUser.getRealname());
            horizontalContentList.add(content5);
        }
        if (ReportRepairEnum.WAIT_CONFIRM.name().equals(repairStatus)) {
            content6.setKeyname("确认人");
            SysUser sysUser = sysUserService.getUserByName(reportRepair.getCreateBy());
            content6.setValue(sysUser.getRealname());
            horizontalContentList.add(content6);
            content3.setValue(repairUser.getRealname());
            horizontalContentList.add(content3);
        }

        templateCardEntity.setHorizontal_content_list(horizontalContentList);