Parcourir la source

物品台账,接口新增processId、taskId

dzx il y a 1 an
Parent
commit
3ef80de145

+ 8 - 0
src/main/java/com/xjrsoft/module/ledger/service/impl/WfSubscriptionServiceImpl.java

@@ -20,8 +20,10 @@ import com.xjrsoft.module.ledger.vo.WfSubscriptionPageVo;
 import com.xjrsoft.module.ledger.vo.WorkflowRecordVo;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.service.IFileService;
+import com.xjrsoft.module.workflow.entity.WorkflowExtra;
 import com.xjrsoft.module.workflow.entity.WorkflowFormRelation;
 import com.xjrsoft.module.workflow.entity.WorkflowRecord;
+import com.xjrsoft.module.workflow.mapper.WorkflowExtraMapper;
 import com.xjrsoft.module.workflow.mapper.WorkflowRecordMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -48,6 +50,8 @@ public class WfSubscriptionServiceImpl extends MPJBaseServiceImpl<WfSubscription
 
     private WorkflowRecordMapper workflowRecordMapper;
 
+    private WorkflowExtraMapper workflowExtraMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(WfSubscription wfSubscription) {
@@ -130,6 +134,10 @@ public class WfSubscriptionServiceImpl extends MPJBaseServiceImpl<WfSubscription
             .eq(WorkflowFormRelation::getFormKeyValue, id)
         );
         info.setWorkflowRecordList(BeanUtil.copyToList(recordList, WorkflowRecordVo.class));
+        info.setProcessId(recordList.get(0).getProcessId());
+
+        //查询最后一个节点的taskId
+        workflowExtraMapper.selectList(new QueryWrapper<WorkflowExtra>().lambda().eq(WorkflowExtra::getProcessId, info.getProcessId()));
         return info;
     }
 

+ 6 - 0
src/main/java/com/xjrsoft/module/ledger/vo/WfSubscriptionListInfoVo.java

@@ -56,4 +56,10 @@ public class WfSubscriptionListInfoVo {
     @ApiModelProperty("流程信息")
     private List<WorkflowRecordVo> workflowRecordList;
 
+    @ApiModelProperty("流程id")
+    private String processId;
+
+    @ApiModelProperty("任务id")
+    private String taskId;
+
 }

+ 0 - 5
src/main/java/com/xjrsoft/module/ledger/vo/WorkflowRecordVo.java

@@ -30,9 +30,4 @@ public class WorkflowRecordVo {
     @ApiModelProperty("操作时间")
     private Date recordTime;
 
-    @ApiModelProperty("流程id")
-    private String processId;
-
-    @ApiModelProperty("任务id")
-    private String taskId;
 }