非空判断

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

@@ -15,6 +15,7 @@ import org.eco.als.service.IDataImportService;
 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;
@@ -61,8 +62,10 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
             (dataImportBo.getSource()));
         queryWrapper.and(DATA_IMPORT.SORTIE_NO.eq
             (dataImportBo.getSortieNo()));
-        queryWrapper.and(DATA_IMPORT.AIRCRAFT_ID.in
-            (dataImportBo.getAircraftId().split(",")));
+        if (StringUtils.isNotBlank(dataImportBo.getAircraftId())) {
+            queryWrapper.and(DATA_IMPORT.AIRCRAFT_ID.in
+                (dataImportBo.getAircraftId().split(",")));
+        }
         queryWrapper.and(DATA_IMPORT.FLIGHT_DATE.eq
             (dataImportBo.getFlightDate()));
         queryWrapper.and(DATA_IMPORT.STATUS.eq

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

@@ -13,6 +13,7 @@ import org.eco.als.service.IFaultDiagnosisService;
 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;
@@ -53,8 +54,10 @@ public class FaultDiagnosisServiceImpl extends BaseServiceImpl<FaultDiagnosisMap
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(FAULT_DIAGNOSIS.SORTIE_NO.eq
             (faultDiagnosisBo.getSortieNo()));
-        queryWrapper.and(FAULT_DIAGNOSIS.AIRCRAFT_ID.in
-            (faultDiagnosisBo.getAircraftId().split(",")));
+        if (StringUtils.isNotBlank(faultDiagnosisBo.getAircraftId())) {
+            queryWrapper.and(FAULT_DIAGNOSIS.AIRCRAFT_ID.in
+                (faultDiagnosisBo.getAircraftId().split(",")));
+        }
 
         return queryWrapper;
     }

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

@@ -13,6 +13,7 @@ import org.eco.als.service.ILifePredictionService;
 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;
@@ -51,8 +52,10 @@ public class LifePredictionServiceImpl extends BaseServiceImpl<LifePredictionMap
 
     private QueryWrapper buildQueryWrapper(LifePredictionBo lifePredictionBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(LIFE_PREDICTION.AIRCRAFT_ID.in
-            (lifePredictionBo.getAircraftId().split(",")));
+        if (StringUtils.isNotBlank(lifePredictionBo.getAircraftId())) {
+            queryWrapper.and(LIFE_PREDICTION.AIRCRAFT_ID.in
+                (lifePredictionBo.getAircraftId().split(",")));
+        }
         queryWrapper.and(LIFE_PREDICTION.NAME.like
             (lifePredictionBo.getName()));
         queryWrapper.and(LIFE_PREDICTION.MODEL.eq

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

@@ -15,6 +15,7 @@ import org.eco.als.service.IMaintenanceRecordService;
 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;
@@ -28,6 +29,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
+import static org.eco.als.domain.table.AirConfigurationTableDef.AIR_CONFIGURATION;
 import static org.eco.als.domain.table.MaintenanceRecordTableDef.MAINTENANCE_RECORD;
 
 /**
@@ -55,10 +57,14 @@ public class MaintenanceRecordServiceImpl extends BaseServiceImpl<MaintenanceRec
 
     private QueryWrapper buildQueryWrapper(MaintenanceRecordBo maintenanceRecordBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(MAINTENANCE_RECORD.AIRCRAFT_TYPE.in
-            (maintenanceRecordBo.getAircraftType().split(",")));
-        queryWrapper.and(MAINTENANCE_RECORD.AIRCRAFT_ID.in
-            (maintenanceRecordBo.getAircraftId().split(",")));
+        if (StringUtils.isNotBlank(maintenanceRecordBo.getAircraftType())) {
+            queryWrapper.and(MAINTENANCE_RECORD.AIRCRAFT_TYPE.in
+                (maintenanceRecordBo.getAircraftType().split(",")));
+        }
+        if (StringUtils.isNotBlank(maintenanceRecordBo.getAircraftId())) {
+            queryWrapper.and(MAINTENANCE_RECORD.AIRCRAFT_ID.in
+                (maintenanceRecordBo.getAircraftId().split(",")));
+        }
         queryWrapper.and(MAINTENANCE_RECORD.SERIAL_NUMBER.eq
             (maintenanceRecordBo.getSerialNumber()));
         queryWrapper.and(MAINTENANCE_RECORD.SPECIALTY.eq

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

@@ -15,6 +15,7 @@ import org.eco.als.service.IWarningService;
 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,8 +58,10 @@ public class WarningServiceImpl extends BaseServiceImpl<WarningMapper, Warning>
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
         queryWrapper.and(WARNING.SORTIE_NO.eq
             (warningBo.getSortieNo()));
-        queryWrapper.and(WARNING.AIRCRAFT_ID.in
-            (warningBo.getAircraftId().split(",")));
+        if (StringUtils.isNotBlank(warningBo.getAircraftId())) {
+            queryWrapper.and(WARNING.AIRCRAFT_ID.in
+                (warningBo.getAircraftId().split(",")));
+        }
         queryWrapper.and(WARNING.CODE.eq
             (warningBo.getCode()));
         queryWrapper.and(WARNING.NAME.like