From f769d817f8ba2522147c73fa93ccacdc3aab0cb6 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 24 十月 2025 18:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
index cc92f2c..84a14f5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaApprovalTodoController.java
@@ -783,7 +783,7 @@
res.setApplicationReason(approvalApplicationsBack.getApplicationReason());
res.setAttachmentUrl(approvalApplicationsBack.getAttachmentUrl());
res.setOperateTime(approvalApplicationAssetBack.getOperateTime());
- res.setExpectReturnDate(approvalApplicationAssetBack.getExpectReturnDate());
+ res.setExpectReturnDate(approvalApplicationAssetBack.getOperateTime());
res.setTitle(approvalApplicationAssetBack.getTitle());
res.setApplicationCode(approvalApplications.getApplicationCode());
res.setIsAudit(extracted(id, approvalApplications));
@@ -1067,6 +1067,8 @@
}
private List<ApprovalFlowNodeListVO> getFlowNodeList(SysUser sysUser, List<OaApprovalFlowAudit> approvalFlowAudits
,List<OaApprovalFlowNode> approvalFlowNodes) {
+ Map<Long, String> userMap = sysUserService.selectAllList().stream()
+ .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS = new ArrayList<>();
Map<Integer, OaApprovalFlowAudit> approvalFlowAuditMap = approvalFlowAudits.stream().collect(Collectors.toMap(OaApprovalFlowAudit::getFlowNodeId, e -> e));
@@ -1075,6 +1077,7 @@
if (sysUser!=null){
approvalFlowNodeListVO.setUserName(sysUser.getNickName());
}
+ approvalFlowNodeListVO.setSignFlag(false);
approvalFlowNodeListVOS.add(approvalFlowNodeListVO);
for (OaApprovalFlowNode approvalFlowNode : approvalFlowNodes) {
ApprovalFlowNodeListVO approvalFlowNodeVO = new ApprovalFlowNodeListVO();
@@ -1082,12 +1085,16 @@
OaApprovalFlowAudit approvalFlowAudit = approvalFlowAuditMap.get(approvalFlowNode.getId());
if (approvalFlowAudit!=null){
approvalFlowNodeVO.setFlowName(approvalFlowAudit.getFlowName());
- approvalFlowNodeVO.setUserName(approvalFlowAudit.getUserName());
+ String s = userMap.get(approvalFlowAudit.getUserId().longValue());
+ if (s!=null){
+ approvalFlowNodeVO.setUserName(s);
+ }
approvalFlowNodeVO.setSignPicUrl(approvalFlowAudit.getSignPicUrl());
approvalFlowNodeVO.setApprovalStatus(approvalFlowAudit.getApprovalStatus());
}else{
approvalFlowNodeVO.setFlowName(approvalFlowNode.getFlowName());
}
+ approvalFlowNodeVO.setSignFlag(approvalFlowNode.getSignFlag());
approvalFlowNodeListVOS.add(approvalFlowNodeVO);
}
return approvalFlowNodeListVOS;
--
Gitblit v1.7.1