diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index d775667..fc37225 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -107,6 +107,9 @@
     public void alarmExport(Integer deviceType, String startTime, String endTime) {
         //告警统计查询
         Map<String, DeviceType> typeMap = getDeviceTypes();
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         List<Map<String, Object>> alarms = deviceDataListService.selectAlarmRecords(deviceType, startTime, endTime);
         wrapDeviceType(typeMap, alarms);
         export(AlarmDataExportEnum.DATA_ALARM.getDefines(), alarms, AlarmDataExportEnum.DATA_ALARM.name());
@@ -115,6 +118,9 @@
     @GetMapping(value = "/data/dataExport")
     public void dataExport(Integer deviceType, String startTime, String endTime) {
         DeviceRepDataExportEnum exportEnum = DeviceRepDataExportEnum.typeOf(deviceType);
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         if (exportEnum == null) {
             throw new ServiceException(500, "设备类型不能为空");
         }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index d775667..fc37225 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -107,6 +107,9 @@
     public void alarmExport(Integer deviceType, String startTime, String endTime) {
         //告警统计查询
         Map<String, DeviceType> typeMap = getDeviceTypes();
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         List<Map<String, Object>> alarms = deviceDataListService.selectAlarmRecords(deviceType, startTime, endTime);
         wrapDeviceType(typeMap, alarms);
         export(AlarmDataExportEnum.DATA_ALARM.getDefines(), alarms, AlarmDataExportEnum.DATA_ALARM.name());
@@ -115,6 +118,9 @@
     @GetMapping(value = "/data/dataExport")
     public void dataExport(Integer deviceType, String startTime, String endTime) {
         DeviceRepDataExportEnum exportEnum = DeviceRepDataExportEnum.typeOf(deviceType);
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         if (exportEnum == null) {
             throw new ServiceException(500, "设备类型不能为空");
         }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 0fef119..783b1ca 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -54,7 +54,7 @@
 
     List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<Map<String, Object>>  selectDeviceList(@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
+    List<Map<String, Object>>  selectDeviceList(@Param("deviceType")Integer deviceType,@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
 
     List<Map<String, Object>> selectAlarmRecords(@Param("deviceType")Integer deviceType,@Param("startTime")String startTime, @Param("endTime")String endTime);
 

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index d775667..fc37225 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -107,6 +107,9 @@
     public void alarmExport(Integer deviceType, String startTime, String endTime) {
         //告警统计查询
         Map<String, DeviceType> typeMap = getDeviceTypes();
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         List<Map<String, Object>> alarms = deviceDataListService.selectAlarmRecords(deviceType, startTime, endTime);
         wrapDeviceType(typeMap, alarms);
         export(AlarmDataExportEnum.DATA_ALARM.getDefines(), alarms, AlarmDataExportEnum.DATA_ALARM.name());
@@ -115,6 +118,9 @@
     @GetMapping(value = "/data/dataExport")
     public void dataExport(Integer deviceType, String startTime, String endTime) {
         DeviceRepDataExportEnum exportEnum = DeviceRepDataExportEnum.typeOf(deviceType);
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         if (exportEnum == null) {
             throw new ServiceException(500, "设备类型不能为空");
         }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 0fef119..783b1ca 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -54,7 +54,7 @@
 
     List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<Map<String, Object>>  selectDeviceList(@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
+    List<Map<String, Object>>  selectDeviceList(@Param("deviceType")Integer deviceType,@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
 
     List<Map<String, Object>> selectAlarmRecords(@Param("deviceType")Integer deviceType,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index ceabddc..8f47019 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -767,6 +767,9 @@
             ) A ON A.devcode = b.devcode
         WHERE
             C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         ORDER BY
             A.logtime
     </select>
@@ -831,10 +834,15 @@
                 <include refid="char_toDate">
                     <property name="paramStr" value="#{endTime}"/>
                 </include>
-            </if></where>
+            </if>
+
+            </where>
 
                 GROUP BY devcode ) e ON b.devcode = e.devcode
         where C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         order by devcode
     </select>
 </mapper>

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index d775667..fc37225 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -107,6 +107,9 @@
     public void alarmExport(Integer deviceType, String startTime, String endTime) {
         //告警统计查询
         Map<String, DeviceType> typeMap = getDeviceTypes();
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         List<Map<String, Object>> alarms = deviceDataListService.selectAlarmRecords(deviceType, startTime, endTime);
         wrapDeviceType(typeMap, alarms);
         export(AlarmDataExportEnum.DATA_ALARM.getDefines(), alarms, AlarmDataExportEnum.DATA_ALARM.name());
@@ -115,6 +118,9 @@
     @GetMapping(value = "/data/dataExport")
     public void dataExport(Integer deviceType, String startTime, String endTime) {
         DeviceRepDataExportEnum exportEnum = DeviceRepDataExportEnum.typeOf(deviceType);
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         if (exportEnum == null) {
             throw new ServiceException(500, "设备类型不能为空");
         }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 0fef119..783b1ca 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -54,7 +54,7 @@
 
     List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<Map<String, Object>>  selectDeviceList(@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
+    List<Map<String, Object>>  selectDeviceList(@Param("deviceType")Integer deviceType,@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
 
     List<Map<String, Object>> selectAlarmRecords(@Param("deviceType")Integer deviceType,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index ceabddc..8f47019 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -767,6 +767,9 @@
             ) A ON A.devcode = b.devcode
         WHERE
             C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         ORDER BY
             A.logtime
     </select>
@@ -831,10 +834,15 @@
                 <include refid="char_toDate">
                     <property name="paramStr" value="#{endTime}"/>
                 </include>
-            </if></where>
+            </if>
+
+            </where>
 
                 GROUP BY devcode ) e ON b.devcode = e.devcode
         where C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         order by devcode
     </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
index 8a9eddb..0da52ae 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
@@ -148,4 +148,12 @@
     public void setOrderColumn(String orderColumn) {
         this.orderColumn = orderColumn;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index d775667..fc37225 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -107,6 +107,9 @@
     public void alarmExport(Integer deviceType, String startTime, String endTime) {
         //告警统计查询
         Map<String, DeviceType> typeMap = getDeviceTypes();
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         List<Map<String, Object>> alarms = deviceDataListService.selectAlarmRecords(deviceType, startTime, endTime);
         wrapDeviceType(typeMap, alarms);
         export(AlarmDataExportEnum.DATA_ALARM.getDefines(), alarms, AlarmDataExportEnum.DATA_ALARM.name());
@@ -115,6 +118,9 @@
     @GetMapping(value = "/data/dataExport")
     public void dataExport(Integer deviceType, String startTime, String endTime) {
         DeviceRepDataExportEnum exportEnum = DeviceRepDataExportEnum.typeOf(deviceType);
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         if (exportEnum == null) {
             throw new ServiceException(500, "设备类型不能为空");
         }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 0fef119..783b1ca 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -54,7 +54,7 @@
 
     List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<Map<String, Object>>  selectDeviceList(@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
+    List<Map<String, Object>>  selectDeviceList(@Param("deviceType")Integer deviceType,@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
 
     List<Map<String, Object>> selectAlarmRecords(@Param("deviceType")Integer deviceType,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index ceabddc..8f47019 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -767,6 +767,9 @@
             ) A ON A.devcode = b.devcode
         WHERE
             C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         ORDER BY
             A.logtime
     </select>
@@ -831,10 +834,15 @@
                 <include refid="char_toDate">
                     <property name="paramStr" value="#{endTime}"/>
                 </include>
-            </if></where>
+            </if>
+
+            </where>
 
                 GROUP BY devcode ) e ON b.devcode = e.devcode
         where C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         order by devcode
     </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
index 8a9eddb..0da52ae 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
@@ -148,4 +148,12 @@
     public void setOrderColumn(String orderColumn) {
         this.orderColumn = orderColumn;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
index e1af1e7..0e679b1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -126,7 +126,7 @@
 
     @Override
     public  List<Map<String, Object>>  selectDeviceList(DeviceDataExportEnum exportEnum, LambdaQueryWrapper<Device> query) {
-        return this.baseMapper.selectDeviceList(exportEnum.getTableName(),exportEnum.getTableColumns(),exportEnum.getOrderColumn());
+        return this.baseMapper.selectDeviceList(exportEnum.getType(),exportEnum.getTableName(),exportEnum.getTableColumns(),exportEnum.getOrderColumn());
     }
 
     @Override

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index d775667..fc37225 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -107,6 +107,9 @@
     public void alarmExport(Integer deviceType, String startTime, String endTime) {
         //告警统计查询
         Map<String, DeviceType> typeMap = getDeviceTypes();
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         List<Map<String, Object>> alarms = deviceDataListService.selectAlarmRecords(deviceType, startTime, endTime);
         wrapDeviceType(typeMap, alarms);
         export(AlarmDataExportEnum.DATA_ALARM.getDefines(), alarms, AlarmDataExportEnum.DATA_ALARM.name());
@@ -115,6 +118,9 @@
     @GetMapping(value = "/data/dataExport")
     public void dataExport(Integer deviceType, String startTime, String endTime) {
         DeviceRepDataExportEnum exportEnum = DeviceRepDataExportEnum.typeOf(deviceType);
+        if(StrUtil.isNotEmpty(endTime)){
+            endTime=endTime+" 23:59:59";
+        }
         if (exportEnum == null) {
             throw new ServiceException(500, "设备类型不能为空");
         }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
index 0fef119..783b1ca 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java
@@ -54,7 +54,7 @@
 
     List<DataPantilt> getPantiltList(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode);
 
-    List<Map<String, Object>>  selectDeviceList(@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
+    List<Map<String, Object>>  selectDeviceList(@Param("deviceType")Integer deviceType,@Param("tableName") String tableName,@Param("tableColumns")String tableColumns,@Param("orderColumn")String orderColumn);
 
     List<Map<String, Object>> selectAlarmRecords(@Param("deviceType")Integer deviceType,@Param("startTime")String startTime, @Param("endTime")String endTime);
 
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index ceabddc..8f47019 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -767,6 +767,9 @@
             ) A ON A.devcode = b.devcode
         WHERE
             C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         ORDER BY
             A.logtime
     </select>
@@ -831,10 +834,15 @@
                 <include refid="char_toDate">
                     <property name="paramStr" value="#{endTime}"/>
                 </include>
-            </if></where>
+            </if>
+
+            </where>
 
                 GROUP BY devcode ) e ON b.devcode = e.devcode
         where C."valid" = '1'
+        <if test="deviceType != null and deviceType !=''">
+            AND b.device_type = #{deviceType}
+        </if>
         order by devcode
     </select>
 </mapper>
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
index 8a9eddb..0da52ae 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/enums/DeviceDataExportEnum.java
@@ -148,4 +148,12 @@
     public void setOrderColumn(String orderColumn) {
         this.orderColumn = orderColumn;
     }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
index e1af1e7..0e679b1 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java
@@ -126,7 +126,7 @@
 
     @Override
     public  List<Map<String, Object>>  selectDeviceList(DeviceDataExportEnum exportEnum, LambdaQueryWrapper<Device> query) {
-        return this.baseMapper.selectDeviceList(exportEnum.getTableName(),exportEnum.getTableColumns(),exportEnum.getOrderColumn());
+        return this.baseMapper.selectDeviceList(exportEnum.getType(),exportEnum.getTableName(),exportEnum.getTableColumns(),exportEnum.getOrderColumn());
     }
 
     @Override
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
index 9e5b366..46db822 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceImeiMapper.xml
@@ -27,8 +27,16 @@
         FROM bus_imei_iccid
         WHERE 1=1
         <if test="devcode != null and devcode !=''">
-            AND DEVCODE = #{devcode}
+            AND (DEVCODE like <include refid="devcode_sql"/> or imei like <include refid="devcode_sql"/> )
         </if>
     </select>
-
+    <sql id="devcode_sql" databaseId="oracle">
+        CONCAT('%',#{devcode},'%')
+    </sql>
+    <sql id="devcode_sql" databaseId="mysql">
+        CONCAT('%',#{devcode},'%')
+    </sql>
+    <sql id="devcode_sql" databaseId="pgsql">
+        CONCAT('%',#{devcode},'%')
+    </sql>
 </mapper>