Przeglądaj źródła

是否可撤回字段

caixiaofeng 5 miesięcy temu
rodzic
commit
22f46aa4e6

+ 1 - 0
flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowInstanceServiceImpl.java

@@ -122,6 +122,7 @@ public class FlowInstanceServiceImpl extends BaseServiceImpl<FlowInstanceDao, Fl
         formInfo.setEndTime(instance.getEndTime());
         formInfo.setStatus(instance.getStatus());
         formInfo.setCancelDays(instance.getCancelDays());
+        formInfo.setIsCancel(instance.getIsCancel());
         return formInfo;
     }
 

+ 1 - 0
flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowTaskServiceImpl.java

@@ -118,6 +118,7 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
         formInfo.setFormName(instance.getName());
         formInfo.setStartUserId(instance.getStartUserId());
         formInfo.setCancelDays(instance.getCancelDays());
+        formInfo.setIsCancel(instance.getIsCancel());
         formInfo.setStartTime(instance.getStartTime());
         if (task instanceof HistoricTaskInstance) {
             HistoricTaskInstance historicTaskInstance = (HistoricTaskInstance) task;

+ 11 - 0
flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/FlowInstance.java

@@ -17,6 +17,8 @@ public class FlowInstance {
     private ProcessStatus status;
     private Integer cancelDays;
     @TableField(exist = false)
+    private Boolean isCancel = false;
+    @TableField(exist = false)
     private String name;
     @TableField(exist = false)
     private String definitionId;
@@ -46,4 +48,13 @@ public class FlowInstance {
         this.duration = milliSecond - startTime.toInstant(ZoneOffset.UTC).toEpochMilli();
     }
 
+    public void setCancelDays(Integer cancelDays) {
+        this.cancelDays = cancelDays;
+        if (this.status == ProcessStatus.RUNNING) {
+            LocalDateTime exp = this.startTime.plusDays(cancelDays);
+            if (LocalDateTime.now().isBefore(exp)) {
+                this.isCancel = true;
+            }
+        }
+    }
 }

+ 2 - 0
flow-workflow/flow-workflow-entity/src/main/java/com/flow/model/FormInfo.java

@@ -32,6 +32,8 @@ public class FormInfo {
     private String startUserId;
     // 撤回天数
     private Integer cancelDays;
+    // 是否可撤回
+    private Boolean isCancel = false;
     // 发起时间
     private LocalDateTime startTime;
     // 结束时间