|
@@ -9,6 +9,7 @@ import lombok.Data;
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
import java.time.ZoneOffset;
|
|
import java.time.ZoneOffset;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
+import java.util.Objects;
|
|
|
|
|
|
@TableName(value = "flow_instance", autoResultMap = true)
|
|
@TableName(value = "flow_instance", autoResultMap = true)
|
|
@Data
|
|
@Data
|
|
@@ -51,9 +52,11 @@ public class FlowInstance {
|
|
public void setCancelDays(Integer cancelDays) {
|
|
public void setCancelDays(Integer cancelDays) {
|
|
this.cancelDays = cancelDays;
|
|
this.cancelDays = cancelDays;
|
|
if (this.status == ProcessStatus.RUNNING) {
|
|
if (this.status == ProcessStatus.RUNNING) {
|
|
- LocalDateTime exp = this.startTime.plusDays(cancelDays);
|
|
|
|
- if (LocalDateTime.now().isBefore(exp)) {
|
|
|
|
- this.isCancel = true;
|
|
|
|
|
|
+ if (Objects.nonNull(this.startTime)) {
|
|
|
|
+ LocalDateTime exp = this.startTime.plusDays(cancelDays);
|
|
|
|
+ if (LocalDateTime.now().isBefore(exp)) {
|
|
|
|
+ this.isCancel = true;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|