fix: 81947 在线编辑--签章页的签章在驳回到主起草人上传会议纪要节点后，换人、转办等操作，签章信息未更新

2024-02-23 17:07:49 +08:00
parent fbe92e9bbf
commit 816258e423
1 changed files with 12 additions and 3 deletions
@@ -726,12 +726,21 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
        }
        result.put("校对签署", otherDraftUsers);

-        // 获取主管级领导审核用户
+        // 获取审核签署+主管级领导用户
+        List<SignInfo> approvalLeaders = new ArrayList<>();
        processApprovalRecords = parMap.get(LEADER_APPROVAL);
+        List<String> approvalUserList = (List<String>) runtimeService.getVariable(processInstanceId, "mainDraftUserLeaderList");
+        // 剔除所有驳回的记录
+        processApprovalRecords.removeIf(ar -> ar.getCommitFlag().equals(CommitFlagEnum.REJECT.getValue()));
        // 将processApprovalRecords按照EndTime倒序排序
        processApprovalRecords.sort(Comparator.comparing(ProcessApprovalRecord::getEndTime).reversed());
-        singInfo = this.getSingInfo(processApprovalRecords.get(0));
-        result.put("审核签署", Collections.singletonList(singInfo));
+        // 取list.size()个数据
+        processApprovalRecords = processApprovalRecords.subList(0, approvalUserList.size());
+        for (ProcessApprovalRecord processApprovalRecord : processApprovalRecords) {
+            singInfo = this.getSingInfo(processApprovalRecord);
+            approvalLeaders.add(singInfo);
+        }
+        result.put("审核签署", approvalLeaders);

        // 获取标准化签署+标准化审核用户
        processApprovalRecords = parMap.get(STANDARDIZATION_APPROVAL);