|
|
@@ -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;
|
|
|
}
|
|
|
|