From 0beec525a8d33d16c5de0d734d106e73b28e9272 Mon Sep 17 00:00:00 2001
From: HuangHuiKang <HuangHuiKang@qq.com>
Date: Thu, 9 Jul 2026 11:34:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A8=A1=E5=85=B7=E7=82=B9=E6=A3=80=E8=AE=B0=E5=BD=95=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=BA=BA=E5=8F=8A=E4=BD=9C=E4=B8=9A=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/MoldTicketManagementPageReqVO.java     |  5 +++-
 .../MoldTicketManagementMapper.java           | 23 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java
index ac2fd8a47..5f64a333e 100644
--- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java
+++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/controller/admin/moldticketmanagement/vo/MoldTicketManagementPageReqVO.java
@@ -41,6 +41,9 @@ public class MoldTicketManagementPageReqVO extends PageParam {
     @Schema(description = "作业结果")
     private String jobResult;
 
+    @Schema(description = "operator")
+    private String operator;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
@@ -63,4 +66,4 @@ public class MoldTicketManagementPageReqVO extends PageParam {
     @Schema(description = "取消原因")
     private String cancelReason;
 
-}
\ No newline at end of file
+}
diff --git a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java
index 466029c6e..2a738c00b 100644
--- a/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java
+++ b/yudao-module-common/yudao-module-common-biz/src/main/java/cn/iocoder/yudao/module/common/dal/mysql/moldticketmanagement/MoldTicketManagementMapper.java
@@ -9,6 +9,9 @@ import com.alibaba.excel.util.StringUtils;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -33,6 +36,9 @@ public interface MoldTicketManagementMapper extends BaseMapperX<MoldTicketManage
                 .likeIfPresent(MoldTicketManagementDO::getConfigName, reqVO.getConfigName())
                 .eqIfPresent(MoldTicketManagementDO::getJobStatus, reqVO.getJobStatus())
                 .eqIfPresent(MoldTicketManagementDO::getJobResult, reqVO.getJobResult())
+                .eqIfPresent(MoldTicketManagementDO::getOperator, reqVO.getOperator())
+                .geIfPresent(MoldTicketManagementDO::getTaskTime, parseTaskTime(reqVO.getTaskTime(), false))
+                .leIfPresent(MoldTicketManagementDO::getTaskTime, parseTaskTime(reqVO.getTaskEndTime(), true))
                 .likeIfPresent(MoldTicketManagementDO::getCancelReason, reqVO.getCancelReason())
                 .orderByDesc(MoldTicketManagementDO::getCreateTime);
 
@@ -50,6 +56,21 @@ public interface MoldTicketManagementMapper extends BaseMapperX<MoldTicketManage
         return selectPage(reqVO,ticketManagementDOLambdaQueryWrapperX);
     }
 
+    default LocalDateTime parseTaskTime(String time, boolean endOfDay) {
+        if (StringUtils.isBlank(time)) {
+            return null;
+        }
+        String value = time.trim();
+        if (value.length() == 10) {
+            LocalDate date = LocalDate.parse(value, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            return endOfDay ? date.plusDays(1).atStartOfDay().minusNanos(1) : date.atStartOfDay();
+        }
+        if (value.length() == 16) {
+            return LocalDateTime.parse(value, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm"));
+        }
+        return LocalDateTime.parse(value, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+    }
+
 
     /**
      * 批量更新作业状态
@@ -62,4 +83,4 @@ public interface MoldTicketManagementMapper extends BaseMapperX<MoldTicketManage
                              @Param("jobStatus") Integer jobStatus,
                              @Param("cancelReason") String cancelReason);
 
-}
\ No newline at end of file
+}