fix:修改添加设备台账-点检记录作业人和作业时间筛选条件

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/ticketmanagement/vo/TicketManagementPageReqVO.java

@@ -46,6 +46,9 @@ public class TicketManagementPageReqVO extends PageParam {
     @Schema(description = "作业结果")
     private String jobResult;
 
+    @Schema(description = "作业人")
+    private String operator;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/ticketmanagement/TicketManagementMapper.java

@@ -15,6 +15,10 @@ import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.yudao.module.mes.controller.admin.ticketmanagement.vo.*;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
 /**
  * 项目方案关联 Mapper
  *
@@ -50,6 +54,9 @@ public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO>
                 .likeIfPresent(TicketManagementDO::getConfigName, reqVO.getConfigName())
                 .eqIfPresent(TicketManagementDO::getJobStatus, reqVO.getJobStatus())
                 .eqIfPresent(TicketManagementDO::getJobResult, reqVO.getJobResult())
+                .eqIfPresent(TicketManagementDO::getOperator, reqVO.getOperator())
+                .geIfPresent(TicketManagementDO::getTaskTime, parseTaskTime(reqVO.getTaskTime(), false))
+                .leIfPresent(TicketManagementDO::getTaskTime, parseTaskTime(reqVO.getTaskEndTime(), true))
                 .likeIfPresent(TicketManagementDO::getCancelReason, reqVO.getCancelReason())
                 .orderByDesc(TicketManagementDO::getId);
 
@@ -67,6 +74,21 @@ public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO>
         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"));
+    }
+
 
     /**
      * 批量更新作业状态
@@ -79,4 +101,4 @@ public interface TicketManagementMapper extends BaseMapperX<TicketManagementDO>
                              @Param("jobStatus") Integer jobStatus,
                              @Param("cancelReason") String cancelReason);
 
-}
+}