update field

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/pojo/response/FlowRecordContent.java

@@ -18,7 +18,11 @@ public class FlowRecordContent {
     /**
      * 工作id
      */
-    private Long workBackupId;
+    private Long workflowRuntimeId;
+    /**
+     * 流程标题
+     */
+    private String workTitle;
     /**
      * 流程编码
      */
@@ -114,7 +118,7 @@ public class FlowRecordContent {
     public static FlowRecordContent convert(FlowRecord record){
         FlowRecordContent content = new FlowRecordContent();
         content.setProcessId(record.getProcessId());
-        content.setWorkBackupId(record.getWorkRuntimeId());
+        content.setWorkflowRuntimeId(record.getWorkRuntimeId());
         content.setWorkCode(record.getWorkCode());
         content.setNodeId(record.getNodeId());
         content.setNodeType(record.getNodeType());
@@ -139,7 +143,7 @@ public static FlowRecordContent convert(FlowRecord record){
     public static FlowRecordContent convert(FlowTodoRecord todoRecord){
         FlowRecordContent content = new FlowRecordContent();
         content.setProcessId(todoRecord.getProcessId());
-        content.setWorkBackupId(todoRecord.getWorkBackupId());
+        content.setWorkflowRuntimeId(todoRecord.getWorkflowRuntimeId());
         content.setWorkCode(todoRecord.getWorkCode());
         content.setNodeId(todoRecord.getNodeId());
         content.setNodeType(todoRecord.getNodeType());

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowRecord.java

@@ -48,6 +48,11 @@ public class FlowRecord {
      * 工作id
      */
     private long workRuntimeId;
+
+    /**
+     * 流程名称
+     */
+    private String workTitle;
     /**
      * 流程编码
      */
@@ -263,7 +268,8 @@ public FlowRecord(FlowSession flowSession, int nodeOrder) {
         // 获取转交之后的审批人
         IFlowOperator currentOperator = flowSession.loadFinalForwardOperator(sourceOperator);
         this.workCode = flowSession.getWorkCode();
-        this.workRuntimeId = flowSession.getBackupId();
+        this.workRuntimeId = flowSession.getWorkflowRuntimeId();
+        this.workTitle = flowSession.getWorkflow().getTitle();
         this.nodeId = flowSession.getCurrentNodeId();
         this.nodeType = flowSession.getCurrentNodeType();
         this.nodeName = flowSession.getCurrentNodeName();

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoRecord.java

@@ -26,7 +26,12 @@ public class FlowTodoRecord {
     /**
      * 工作id
      */
-    private long workBackupId;
+    private long workflowRuntimeId;
+
+    /**
+     * 流程名称
+     */
+    private String workTitle;
     /**
      * 流程编码
      */
@@ -114,7 +119,8 @@ public FlowTodoRecord(FlowRecord flowRecord) {
 
     public void update(FlowRecord flowRecord) {
         this.processId = flowRecord.getProcessId();
-        this.workBackupId = flowRecord.getWorkRuntimeId();
+        this.workflowRuntimeId = flowRecord.getWorkRuntimeId();
+        this.workTitle = flowRecord.getWorkTitle();
         this.workCode = flowRecord.getWorkCode();
         this.nodeId = flowRecord.getNodeId();
         this.nodeType = flowRecord.getNodeType();

flow-engine-framework/src/main/java/com/codingapi/flow/session/FlowSession.java

@@ -63,7 +63,7 @@ public class FlowSession {
     /**
      * 流程备份id
      */
-    private final long backupId;
+    private final long workflowRuntimeId;
 
     /**
      * 审批意见
@@ -79,7 +79,7 @@ public FlowSession(IRepositoryHolder repositoryHolder,
                        FormData formData,
                        FlowRecord currentRecord,
                        List<FlowRecord> currentNodeRecords,
-                       long backupId,
+                       long workflowRuntimeId,
                        FlowAdvice advice) {
         this.repositoryHolder = repositoryHolder;
         this.currentOperator = currentOperator;
@@ -89,7 +89,7 @@ public FlowSession(IRepositoryHolder repositoryHolder,
         this.currentRecord = currentRecord;
         this.currentNodeRecords = currentNodeRecords;
         this.formData = formData;
-        this.backupId = backupId;
+        this.workflowRuntimeId = workflowRuntimeId;
         this.advice = advice;
     }
 
@@ -229,7 +229,7 @@ public Object getFormData(String fieldCode) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowNode currentNode) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, backupId, advice);
+        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
 
@@ -240,7 +240,7 @@ public FlowSession updateSession(IFlowNode currentNode) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowAction currentAction) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, backupId, advice);
+        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
     /**
@@ -250,7 +250,7 @@ public FlowSession updateSession(IFlowAction currentAction) {
      * @return 新的会话
      */
     public FlowSession updateSession(IFlowOperator currentOperator) {
-        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, backupId, advice);
+        return new FlowSession(repositoryHolder,currentOperator, workflow, currentNode, currentAction, formData, currentRecord, currentNodeRecords, workflowRuntimeId, advice);
     }
 
 }

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/FlowRecordContentConvertor.java

@@ -11,7 +11,8 @@ public class FlowRecordContentConvertor {
     public static FlowRecordContent convert(FlowTodoRecordEntity todoRecord){
         FlowRecordContent content = new FlowRecordContent();
         content.setProcessId(todoRecord.getProcessId());
-        content.setWorkBackupId(todoRecord.getWorkBackupId());
+        content.setWorkflowRuntimeId(todoRecord.getWorkflowRuntimeId());
+        content.setWorkTitle(todoRecord.getWorkTitle());
         content.setWorkCode(todoRecord.getWorkCode());
         content.setNodeId(todoRecord.getNodeId());
         content.setNodeType(todoRecord.getNodeType());
@@ -38,7 +39,8 @@ public static FlowRecordContent convert(FlowTodoRecordEntity todoRecord){
     public static FlowRecordContent convert(FlowRecordEntity record){
         FlowRecordContent content = new FlowRecordContent();
         content.setProcessId(record.getProcessId());
-        content.setWorkBackupId(record.getWorkRuntimeId());
+        content.setWorkflowRuntimeId(record.getWorkRuntimeId());
+        content.setWorkTitle(record.getWorkTitle());
         content.setWorkCode(record.getWorkCode());
         content.setNodeId(record.getNodeId());
         content.setNodeType(record.getNodeType());

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/FlowRecordConvertor.java

@@ -14,6 +14,7 @@ public static FlowRecord convert(FlowRecordEntity entity) {
         }
         return new FlowRecord(entity.getId(),
                 entity.getWorkRuntimeId(),
+                entity.getWorkTitle(),
                 entity.getWorkCode(),
                 entity.getNodeId(),
                 entity.getNodeType(),
@@ -66,6 +67,7 @@ public static FlowRecordEntity convert(FlowRecord record) {
             entity.setId(record.getId());
         }
         entity.setWorkRuntimeId(record.getWorkRuntimeId());
+        entity.setWorkTitle(record.getWorkTitle());
         entity.setWorkCode(record.getWorkCode());
         entity.setNodeId(record.getNodeId());
         entity.setNodeType(record.getNodeType());

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/FlowTodoRecordConvertor.java

@@ -12,7 +12,8 @@ public static FlowTodoRecord convert(FlowTodoRecordEntity entity){
         return new FlowTodoRecord(
                 entity.getId(),
                 entity.getProcessId(),
-                entity.getWorkBackupId(),
+                entity.getWorkflowRuntimeId(),
+                entity.getWorkTitle(),
                 entity.getWorkCode(),
                 entity.getNodeId(),
                 entity.getNodeType(),
@@ -43,7 +44,8 @@ public static FlowTodoRecordEntity convert(FlowTodoRecord record){
             entity.setId(record.getId());
         }
         entity.setProcessId(record.getProcessId());
-        entity.setWorkBackupId(record.getWorkBackupId());
+        entity.setWorkflowRuntimeId(record.getWorkflowRuntimeId());
+        entity.setWorkTitle(record.getWorkTitle());
         entity.setWorkCode(record.getWorkCode());
         entity.setNodeId(record.getNodeId());
         entity.setNodeType(record.getNodeType());

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/FlowRecordEntity.java

@@ -17,6 +17,10 @@ public class FlowRecordEntity {
      * 工作id
      */
     private Long workRuntimeId;
+    /**
+     * 流程标题
+     */
+    private String workTitle;
     /**
      * 流程编码
      */

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/FlowTodoRecordEntity.java

@@ -25,7 +25,11 @@ public class FlowTodoRecordEntity {
     /**
      * 工作id
      */
-    private Long workBackupId;
+    private Long workflowRuntimeId;
+    /**
+     * 流程标题
+     */
+    private String workTitle;
     /**
      * 流程编码
      */