From 29d608705c2d50ce565bd3fdb8f216e10a64bcfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= <z982093659@qq.com>
Date: Mon, 18 May 2026 14:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E4=BB=BB=E5=8A=A1=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=B8=8B=E5=8F=91=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/quality/pojo/vo/LiquidTankTaskVO.java  | 17 +++++++++++++++++
 .../quality/mapper/LiquidTankTaskMapper.xml     |  8 ++++++++
 2 files changed, 25 insertions(+)

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
         <if test = "task.status != null and task.status != ''">
             AND task.STATUS = #{task.status}
         </if>
+
+        <if test = "task.createTimeStart != null">
+            AND task.CREATE_TIME &gt;= #{task.createTimeStart}
+        </if>
+
+        <if test = "task.createTimeEnd != null">
+            AND task.CREATE_TIME &lt;= #{task.createTimeEnd}
+        </if>
     </select>
 
     <select id="exportLiquidTankTask"