fix:修改添加模具点检记录作业人及作业时间筛选条件

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;
 
-}
+}

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);
 
-}
+}