diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java index f6cd4f013..c7b867db0 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java @@ -12,4 +12,6 @@ public class DictSingleTaskReq { private TypeEnums type; @NotNull private Long itemId; + private String startDate; + private String endDate; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java index a4ab0cfc5..993a473a0 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java @@ -445,14 +445,18 @@ public class DictUtils { if (DateConf.DateMode.ALL.equals(config.getDateConf().getDateMode())) { return ""; } + // 静态日期 if (DateConf.DateMode.BETWEEN.equals(config.getDateConf().getDateMode())) { return String.format("( %s >= '%s' and %s <= '%s' )", - config.getDateConf().getDateField(), config.getDateConf().getStartDate(), - config.getDateConf().getDateField(), config.getDateConf().getEndDate()); + partitionTimeDimension.getBizName(), config.getDateConf().getStartDate(), + partitionTimeDimension.getBizName(), config.getDateConf().getEndDate()); } + // 动态日期 if (DateConf.DateMode.RECENT.equals(config.getDateConf().getDateMode())) { + dictItemResp.getConfig().getDateConf() + .setDateField(partitionTimeDimension.getBizName()); return generateDictDateFilterRecent(dictItemResp); }