From fcc35dbfd0d7a7ce13156f2647d90eb102d40bd0 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期六, 23 八月 2025 16:38:05 +0800
Subject: [PATCH] 周报工单，无法领取处理
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 29 +++++++----------------------
1 files changed, 7 insertions(+), 22 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 d4b6af2..4de4d66 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,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 {
//琚┏鍥炵殑宸ュ崟
@@ -455,42 +459,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();
@@ -581,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());
--
Gitblit v1.9.3