diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java index bd38c145d..53ca91e0b 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java @@ -3,11 +3,13 @@ */ package org.springblade.desk.quality.pojo.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; import java.time.LocalDate; @@ -94,4 +96,19 @@ public class LiquidTankTaskVO extends LiquidTankTask { @Schema(description = "槽液到期时间") private LocalDateTime tankEndTime; + /** + * 创建时间-开始 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "创建时间-开始") + private LocalDateTime createTimeStart; + /** + * 创建时间-结束 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Schema(description = "创建时间-结束") + private LocalDateTime createTimeEnd; + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml index b72eac571..73d8aea55 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankTaskMapper.xml @@ -162,6 +162,14 @@ TS_NAME AND task.STATUS = #{task.status} + + + AND task.CREATE_TIME >= #{task.createTimeStart} + + + + AND task.CREATE_TIME <= #{task.createTimeEnd} +