|
@@ -987,6 +987,14 @@ public class WorkspaceProcessController {
|
|
|
taskDetailVO.setComment(comment.getFullMessage());
|
|
|
List<Attachment> attachments = attachmentMap.get(historicActivityInstance.getTaskId());
|
|
|
|
|
|
+ // TODO: 2024/3/9 获取任务执行的用户
|
|
|
+ String userId = comment.getUserId();
|
|
|
+ log.info("userId:{}", userId);
|
|
|
+ String username = processTemplateService.getUserNameByUserId(userId);
|
|
|
+ log.info("username:{}", username);
|
|
|
+ taskDetailVO.setUsername(username);
|
|
|
+
|
|
|
+
|
|
|
List<AttachmentVO> attachmentVOList = new ArrayList<>();
|
|
|
|
|
|
if (attachments != null) {
|
|
@@ -1245,6 +1253,12 @@ public class WorkspaceProcessController {
|
|
|
}
|
|
|
handleDataVO.setProcessTemplates(processTemplates);
|
|
|
handleDataVO.setDetailVOList(deatailMap);
|
|
|
+
|
|
|
+ //handleDataVO 设置审批状态
|
|
|
+ handleDataVO.setBusinessStatus(MapUtil.getStr(processVariables,PROCESS_STATUS));
|
|
|
+ String str = MapUtil.getStr(processVariables, PROCESS_STATUS);
|
|
|
+ //log.info("str:{}", str);
|
|
|
+
|
|
|
return Result.OK(handleDataVO);
|
|
|
}
|
|
|
|