From 51c15315616f920ebf4b616ae3bba8759bc6fd00 Mon Sep 17 00:00:00 2001 From: ulleo Date: Tue, 22 Oct 2024 17:10:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(X-Pack):=20=E6=95=B0=E6=8D=AE=E5=A1=AB?= =?UTF-8?q?=E6=8A=A5=E4=BB=BB=E5=8A=A1=E5=A2=9E=E5=8A=A0=E7=AB=8B=E5=8D=B3?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- de-xpack | 2 +- .../io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java | 1 + ...FinishTaskEnum.java => DataFillingFinishTaskEnum.java} | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) rename sdk/common/src/main/java/io/dataease/constant/{DadaFillingFinishTaskEnum.java => DataFillingFinishTaskEnum.java} (67%) diff --git a/de-xpack b/de-xpack index 3723a5f121..ed104fddef 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 3723a5f1212d2c626111f7a3f2920ba85acaaa30 +Subproject commit ed104fddeff7945c0833bdbdb620c44d7885984e diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java index b140f12215..fdd5611304 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/dataFilling/dto/TaskInfoVO.java @@ -40,6 +40,7 @@ public class TaskInfoVO implements Serializable { private String fitColumn; private Integer rateType; + private Integer oneTimeType; private String rateVal; diff --git a/sdk/common/src/main/java/io/dataease/constant/DadaFillingFinishTaskEnum.java b/sdk/common/src/main/java/io/dataease/constant/DataFillingFinishTaskEnum.java similarity index 67% rename from sdk/common/src/main/java/io/dataease/constant/DadaFillingFinishTaskEnum.java rename to sdk/common/src/main/java/io/dataease/constant/DataFillingFinishTaskEnum.java index 532e1bf3a4..f21004ae97 100644 --- a/sdk/common/src/main/java/io/dataease/constant/DadaFillingFinishTaskEnum.java +++ b/sdk/common/src/main/java/io/dataease/constant/DataFillingFinishTaskEnum.java @@ -2,7 +2,7 @@ package io.dataease.constant; import java.util.Arrays; -public enum DadaFillingFinishTaskEnum { +public enum DataFillingFinishTaskEnum { OPEN(0), FINISHED(1); @@ -16,14 +16,14 @@ public enum DadaFillingFinishTaskEnum { this.flag = flag; } - DadaFillingFinishTaskEnum(Integer flag) { + DataFillingFinishTaskEnum(Integer flag) { this.flag = flag; } - DadaFillingFinishTaskEnum() { + DataFillingFinishTaskEnum() { } - public static DadaFillingFinishTaskEnum fromValue(Integer flag) { + public static DataFillingFinishTaskEnum fromValue(Integer flag) { return Arrays.stream(values()).filter(v -> v.flag.equals(flag)).findFirst().get(); } }