周报工单，无法领取处理

Houjie

19 小时以前 fcc35dbfd0d7a7ce13156f2647d90eb102d40bd0

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

@@ -432,8 +432,12 @@
                //新增的工单（指定了保养人）、新领取的工单
                TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
                content.setKeyname("发起人");
                SysUser sysUser = sysUserService.getUserByName(order.getCreateBy());
                content.setValue(sysUser.getRealname());
                if (order.getCreateBy() == null) {
                    content.setValue("定时任务生成");
                } else {
                    SysUser  sysUser = sysUserService.getUserByName(order.getCreateBy());
                    content.setValue(sysUser.getRealname());
                }
                horizontalContentList.add(content);
            } else {
                //被驳回的工单
@@ -562,7 +566,7 @@
                }
                //班组长确认
                userApprovalList = new ArrayList<>();
                userApprovalList.add(equipment.getEquipmentManager().substring(2));//设备台账表维护的设备管理员工号是带 WK前缀的
                userApprovalList.add(equipment.getEquipmentManager());
                values.put("dataId", entity.getId());
                values.put("organization", request.getConfirmComment());
                values.put("comment", request.getConfirmComment());