故障案例查询

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

@@ -1,12 +1,13 @@
 package org.eco.als.domain.bo;
 
-import org.eco.als.domain.FaultCase;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.eco.als.domain.FaultCase;
 import org.eco.common.orm.core.domain.BaseEntity;
 
+import java.util.List;
+
 /**
  * 故障案例业务对象 als_fault_case_t
  *
@@ -26,11 +27,19 @@ public class FaultCaseBo extends BaseEntity {
      * 飞机编号
      */
     private String aircraftCode;
+    /**
+     * 飞机编号s
+     */
+    private List<String> aircraftCodes;
 
     /**
      * 机型
      */
     private String aircraftType;
+    /**
+     * 机型s
+     */
+    private List<String> aircraftTypes;
 
     /**
      * 故障代码

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

@@ -15,7 +15,6 @@ import org.eco.als.service.IFaultCaseService;
 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;
@@ -57,10 +56,9 @@ public class FaultCaseServiceImpl extends BaseServiceImpl<FaultCaseMapper, Fault
     private QueryWrapper buildQueryWrapper(FaultCaseBo faultCaseBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_CASE.AIRCRAFT_CODE.eq(faultCaseBo.getAircraftCode()));
-        if (StringUtils.isNotBlank(faultCaseBo.getAircraftType())) {
-            String[] airTypeIds = faultCaseBo.getAircraftType().split(",");
-            queryWrapper.and(FAULT_CASE.AIRCRAFT_TYPE.in(airTypeIds));
-        }
+        queryWrapper.and(FAULT_CASE.AIRCRAFT_TYPE.eq(faultCaseBo.getAircraftType()));
+        queryWrapper.and(FAULT_CASE.AIRCRAFT_CODE.in(faultCaseBo.getAircraftCodes()));
+        queryWrapper.and(FAULT_CASE.AIRCRAFT_TYPE.in(faultCaseBo.getAircraftTypes()));
         queryWrapper.and(FAULT_CASE.FAULT_CODE.eq(faultCaseBo.getFaultCode()));
         queryWrapper.and(FAULT_CASE.FAULT_NAME.like(faultCaseBo.getFaultName()));
         queryWrapper.and(FAULT_CASE.OSS_ID.eq(faultCaseBo.getOssId()));