diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/vo/DataRefluxConfigPageReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/vo/DataRefluxConfigPageReqVO.java index cd3e8c8c7..1b9abaf41 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/vo/DataRefluxConfigPageReqVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/datarefluxconfig/vo/DataRefluxConfigPageReqVO.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.llm.controller.admin.datarefluxconfig.vo; import lombok.*; + +import java.time.LocalDate; import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; import cn.iocoder.yudao.framework.common.pojo.PageParam; @@ -29,9 +31,9 @@ public class DataRefluxConfigPageReqVO extends PageParam { private LocalDateTime[] createTime; @Schema(description = "开始时间") - private LocalDateTime startTime; + private String startTime; @Schema(description = "结束时间") - private LocalDateTime endTime; + private String endTime; } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java index b802a3e45..6e7d8f2f2 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/datarefluxdata/DataRefluxDataServiceImpl.java @@ -9,6 +9,10 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.format.DateTimeFormatter; import java.util.*; import cn.iocoder.yudao.module.llm.controller.admin.datarefluxdata.vo.*; import cn.iocoder.yudao.module.llm.dal.dataobject.datarefluxdata.DataRefluxDataDO; @@ -84,10 +88,23 @@ public class DataRefluxDataServiceImpl implements DataRefluxDataService { @Override public List getTheDetails(DataRefluxConfigPageReqVO pageReqVO) { +// DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + // 解析字符串为 LocalDate + LocalDateTime startDate = null; + LocalDateTime endDate = null; + if (pageReqVO.getStartTime() != null&& pageReqVO.getStartTime()!=""){ + startDate = LocalDate.parse(pageReqVO.getStartTime(), formatter).atStartOfDay();; + } + if (pageReqVO.getEndTime() != null && pageReqVO.getEndTime()!=""){ + endDate = LocalDate.parse(pageReqVO.getEndTime(), formatter).atTime(LocalTime.MAX); + } + + // 解析字符串为 LocalDate LambdaQueryWrapper eq = new LambdaQueryWrapper() .eq(ObjectUtil.isNotNull(pageReqVO.getId()),DataRefluxDataDO::getConfigId, pageReqVO.getId()) - .le(ObjectUtil.isNotNull(pageReqVO.getStartTime()),DataRefluxDataDO::getCreateTime, pageReqVO.getStartTime()) - .ge(ObjectUtil.isNotNull(pageReqVO.getEndTime()),DataRefluxDataDO::getCreateTime, pageReqVO.getEndTime()); + .ge(ObjectUtil.isNotNull(pageReqVO.getStartTime()),DataRefluxDataDO::getCreateTime, startDate) + .le(ObjectUtil.isNotNull(pageReqVO.getEndTime()),DataRefluxDataDO::getCreateTime,endDate); return dataRefluxDataMapper.selectList(eq); }