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

src/main/java/com/xjrsoft/module/ledger/controller/WfSubscriptionController.java

@@ -77,7 +77,7 @@ public class WfSubscriptionController {
     }
 
 
-    @GetMapping("/export")
+    @PostMapping("/export-query")
     @ApiOperation(value = "导出")
     public ResponseEntity<byte[]> exportData(@Valid WfSubscriptionPageDto dto, @RequestParam(defaultValue = "false") Boolean isTemplate) {
         List<WfSubscriptionExcelVo> customerList = wfSubscriptionService.getList(dto);

src/main/java/com/xjrsoft/module/ledger/service/impl/WfSubscriptionServiceImpl.java

@@ -24,6 +24,7 @@ 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.WorkflowFormRelationMapper;
 import com.xjrsoft.module.workflow.mapper.WorkflowRecordMapper;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -52,6 +53,8 @@ public class WfSubscriptionServiceImpl extends MPJBaseServiceImpl<WfSubscription
 
     private WorkflowExtraMapper workflowExtraMapper;
 
+    private WorkflowFormRelationMapper workflowFormRelationMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean add(WfSubscription wfSubscription) {
@@ -134,10 +137,17 @@ public class WfSubscriptionServiceImpl extends MPJBaseServiceImpl<WfSubscription
             .eq(WorkflowFormRelation::getFormKeyValue, id)
         );
         info.setWorkflowRecordList(BeanUtil.copyToList(recordList, WorkflowRecordVo.class));
-        info.setProcessId(recordList.get(0).getProcessId());
+        List<WorkflowFormRelation> relations = workflowFormRelationMapper.selectList(new QueryWrapper<WorkflowFormRelation>().lambda().eq(WorkflowFormRelation::getFormKeyValue, id));
+
+        info.setProcessId(relations.get(0).getProcessId());
 
         //查询最后一个节点的taskId
-        workflowExtraMapper.selectList(new QueryWrapper<WorkflowExtra>().lambda().eq(WorkflowExtra::getProcessId, info.getProcessId()));
+        List<WorkflowExtra> taskList = workflowExtraMapper.selectList(
+            new QueryWrapper<WorkflowExtra>().lambda()
+            .eq(WorkflowExtra::getProcessId, info.getProcessId())
+            .orderByDesc(WorkflowExtra::getStartTime)
+        );
+        info.setTaskId(taskList.get(0).getTaskId());
         return info;
     }
 

src/main/java/com/xjrsoft/module/ledger/vo/WorkflowRecordVo.java

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