فهرست منبع

我的申请,增加活动id返回

dzx 1 سال پیش
والد
کامیت
6b9669576c

+ 1 - 0
src/main/java/com/xjrsoft/module/workflow/dto/MyProcessPageDto.java

@@ -53,4 +53,5 @@ public class MyProcessPageDto extends PageInput {
      */
     @ApiModelProperty("类型 1完成 2未完成 ")
     private Integer type;
+
 }

+ 2 - 3
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -3363,8 +3363,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
 
             for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
-
-                //找到当前流程的 任务开始时间 最大值  为当前审批节点
+                //找到当前流程的 任务开始时间 最大值 为当前审批节点
                 workflowExtras.stream()
                         .filter(e -> e.getProcessId().equals(historicProcessInstance.getId()))
                         .max(Comparator.comparing(WorkflowExtra::getStartTime))
@@ -3375,10 +3374,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                             vo.setSchemaName(e.getSchemaName());
                             vo.setOriginator(e.getStartUserName());
                             vo.setSchemaId(e.getSchemaId());
-
                             vo.setTaskName(e.getTaskName());
                             vo.setCurrentTaskName(e.getTaskName());
                             vo.setTaskId(e.getTaskId());
+                            vo.setActivityId(historicProcessInstance.getStartActivityId());
                             vo.setCreateTime(e.getStartTime());
                             vo.setProcessId(e.getProcessId());
                             vo.setProcessName(e.getProcessName());

+ 3 - 0
src/main/java/com/xjrsoft/module/workflow/vo/MyProcessPageVo.java

@@ -72,4 +72,7 @@ public class MyProcessPageVo {
 
     @ApiModelProperty("是否已审批(0:否 1:是)")
     private Integer isApproval;
+
+    @ApiModelProperty("活动Id")
+    private String activityId;
 }