From 61281a4e5e51bdfdcdd6e6180660e0d621d04940 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期六, 23 八月 2025 16:26:45 +0800
Subject: [PATCH] 周报工单,无法领取问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index 4bc6c16..599c453 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -432,7 +432,7 @@
//鏂板鐨勫伐鍗曪紙鎸囧畾浜嗕繚鍏讳汉锛夈�佹柊棰嗗彇鐨勫伐鍗�
TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
content.setKeyname("鍙戣捣浜�");
- SysUser sysUser = sysUserService.getUserByName(order.getCreateBy());
+ SysUser sysUser = sysUserService.getUserByName(order.getOperator());
content.setValue(sysUser.getRealname());
horizontalContentList.add(content);
} else {
@@ -455,42 +455,23 @@
SysUser sysUser = sysUserService.getUserByName(order.getOperator());
content.setValue(sysUser.getRealname());
horizontalContentList.add(content);
- //TemplateCardEntity.HorizontalContent content = new TemplateCardEntity.HorizontalContent();
- //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
- //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
- //content.setKeyname("纭浜�");
- //content.setValue(realNameStr);
- //horizontalContentList.add(content);
}
if (WeekMaintenanceStatusEnum.WAIT_INITIAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
- //TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
String confirmAssignee = request.getAssignee();
SysUser confirmUser = sysUserService.getUserByName(confirmAssignee);
content3.setKeyname("纭浜�");
content3.setValue(confirmUser.getRealname());
horizontalContentList.add(content3);
- //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
- //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
- //content4.setKeyname("鍒濋獙浜�");
- //content4.setValue(realNameStr);
- //horizontalContentList.add(content4);
}
if (WeekMaintenanceStatusEnum.WAIT_FINAL_ACCEPTANCE.name().equals(maintenanceStatus)) {
TemplateCardEntity.HorizontalContent content3 = new TemplateCardEntity.HorizontalContent();
- //TemplateCardEntity.HorizontalContent content4 = new TemplateCardEntity.HorizontalContent();
String initialAssignee = request.getAssignee();
SysUser initialUser = sysUserService.getUserByName(initialAssignee);
content3.setKeyname("鍒濋獙浜�");
content3.setValue(initialUser.getRealname());
horizontalContentList.add(content3);
- //List<String> nextAssignee = (List<String>) request.getValues().get("NextAssignee");
- //String realNameStr = sysUserService.getRealNameStrByUserNameList(nextAssignee);
- //content4.setKeyname("缁堥獙浜�");
- //content4.setValue(realNameStr);
- //horizontalContentList.add(content4);
}
-
templateCardEntity.setHorizontal_content_list(horizontalContentList);
TemplateCardEntity.CardAction cardAction = new TemplateCardEntity.CardAction();
--
Gitblit v1.9.3