定检任务批量查询修改

als-modules/agile-assurance/src/main/java/org/eco/als/domain/bo/MaintenanceTaskBo.java

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
 import java.util.Date;
+import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.eco.common.orm.core.domain.BaseEntity;
@@ -35,11 +36,13 @@ public class MaintenanceTaskBo extends BaseEntity {
      * 飞机编码
      */
     private String aircraftCode;
+    private List<String> aircraftCodes;
 
     /**
      * 飞机机型
      */
     private String aircraftType;
+    private List<String> aircraftTypes;
 
     /**
      * 数据来源

als-modules/agile-assurance/src/main/java/org/eco/als/service/impl/MaintenanceTaskServiceImpl.java

@@ -15,7 +15,6 @@ import org.eco.als.service.IMaintenanceTaskService;
 import org.eco.common.core.core.domain.model.LoginUser;
 import org.eco.common.core.core.page.PageResult;
 import org.eco.common.core.utils.MapstructUtils;
-import org.eco.common.core.utils.StringUtils;
 import org.eco.common.excel.entity.ExcelResultRes;
 import org.eco.common.excel.service.IExcelService;
 import org.eco.common.orm.core.page.PageQuery;
@@ -58,13 +57,14 @@ public class MaintenanceTaskServiceImpl extends BaseServiceImpl<MaintenanceTaskM
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(MAINTENANCE_TASK.TASK_ID.eq
             (maintenanceTaskBo.getTaskId()));
+        queryWrapper.and(MAINTENANCE_TASK.AIRCRAFT_CODE.in
+            (maintenanceTaskBo.getAircraftCodes()));
+        queryWrapper.and(MAINTENANCE_TASK.AIRCRAFT_TYPE.in
+            (maintenanceTaskBo.getAircraftTypes()));
         queryWrapper.and(MAINTENANCE_TASK.AIRCRAFT_CODE.eq
             (maintenanceTaskBo.getAircraftCode()));
-        if (StringUtils.isNotBlank(maintenanceTaskBo.getAircraftType())) {
-            String[] airTypeIds = maintenanceTaskBo.getAircraftType().split(",");
-            queryWrapper.and(MAINTENANCE_TASK.AIRCRAFT_TYPE.in
-                (airTypeIds));
-        }
+        queryWrapper.and(MAINTENANCE_TASK.AIRCRAFT_TYPE.eq
+            (maintenanceTaskBo.getAircraftType()));
         queryWrapper.and(MAINTENANCE_TASK.DATA_TYPE.eq
             (maintenanceTaskBo.getDataType()));
         queryWrapper.and(MAINTENANCE_TASK.FAULT_CODE.eq