装机管理字段调整

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

@@ -32,7 +32,7 @@ public class AirInstall extends BaseEntity {
     /**
      * 构型Id
      */
-    private Long configId;
+    private String configId;
 
     /**
      * 器材编码

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

@@ -24,7 +24,7 @@ public class AirInstallBo extends BaseEntity {
     /**
      * 构型Id
      */
-    private Long configId;
+    private String configId;
 
     /**
      * 器材编码

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallImportVo.java

@@ -28,7 +28,7 @@ public class AirInstallImportVo implements Serializable {
      * 构型Id
      */
     @ExcelProperty(value = "构型Id")
-    private Long configId;
+    private String configId;
 
     /**
      * 器材编码

als-modules/agile-assurance/src/main/java/org/eco/als/domain/vo/AirInstallVo.java

@@ -38,7 +38,7 @@ public class AirInstallVo extends BaseEntity implements Serializable {
      * 构型Id
      */
     @ExcelProperty(value = "构型Id")
-    private Long configId;
+    private String configId;
 
     /**
      * 器材编码

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

@@ -15,6 +15,7 @@ import org.eco.als.service.IAirInstallService;
 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.AirInstallTableDef.AIR_INSTALL;
 
 /**
@@ -55,7 +57,10 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
 
     private QueryWrapper buildQueryWrapper(AirInstallBo airInstallBo) {
         QueryWrapper queryWrapper = super.buildBaseQueryWrapper();
-        queryWrapper.and(AIR_INSTALL.CONFIG_ID.eq(airInstallBo.getConfigId()));
+        if (StringUtils.isNotBlank(airInstallBo.getConfigId())) {
+            String[] airTypeIds = airInstallBo.getConfigId().split(",");
+            queryWrapper.and(AIR_INSTALL.CONFIG_ID.in(airTypeIds));
+        }
         queryWrapper.and(AIR_INSTALL.DEVICES_ENCODE.eq(airInstallBo.getDevicesEncode()));
         queryWrapper.and(AIR_INSTALL.DEVICES_CODE.eq(airInstallBo.getDevicesCode()));
         queryWrapper.and(AIR_INSTALL.DEVICES_NAME.like(airInstallBo.getDevicesName()));
@@ -69,6 +74,7 @@ public class AirInstallServiceImpl extends BaseServiceImpl<AirInstallMapper, Air
         queryWrapper.and(AIR_INSTALL.COMPLETE_SET.eq(airInstallBo.getCompleteSet()));
         queryWrapper.and(AIR_INSTALL.SERVICE_LIFE.eq(airInstallBo.getServiceLife()));
         queryWrapper.and(AIR_INSTALL.REMARKS.eq(airInstallBo.getRemarks()));
+        queryWrapper.orderBy(AIR_INSTALL.UPDATE_TIME.desc());
 
         return queryWrapper;
     }