diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3a34d79..4a95d42 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -128,8 +128,10 @@
             <![CDATA[ and ar.ALARM_TIME <= #{endTime} ]]>
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and ( ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            or bd.devcode like concat('%',CONCAT(#{keywords},'%')))
         </if>
+
         <if test="wellName!='' and wellName!=null">
             and bwi.WELL_NAME like concat('%',CONCAT(#{wellName},'%'))
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3a34d79..4a95d42 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -128,8 +128,10 @@
             <![CDATA[ and ar.ALARM_TIME <= #{endTime} ]]>
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and ( ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            or bd.devcode like concat('%',CONCAT(#{keywords},'%')))
         </if>
+
         <if test="wellName!='' and wellName!=null">
             and bwi.WELL_NAME like concat('%',CONCAT(#{wellName},'%'))
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index d01bbd5..04f9892 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -79,4 +79,8 @@
     void updateAllJobGenerationType(String jobGenerationType);
 
     Map<String,Object> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
+
+    List<Map<String,String>> selectDept3List();
+
+    List<Map<String,String>> selectArea3List();
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3a34d79..4a95d42 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -128,8 +128,10 @@
             <![CDATA[ and ar.ALARM_TIME <= #{endTime} ]]>
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and ( ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            or bd.devcode like concat('%',CONCAT(#{keywords},'%')))
         </if>
+
         <if test="wellName!='' and wellName!=null">
             and bwi.WELL_NAME like concat('%',CONCAT(#{wellName},'%'))
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index d01bbd5..04f9892 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -79,4 +79,8 @@
     void updateAllJobGenerationType(String jobGenerationType);
 
     Map<String,Object> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
+
+    List<Map<String,String>> selectDept3List();
+
+    List<Map<String,String>> selectArea3List();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index ef1a9a9..2bc9dfd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -968,4 +968,18 @@
           and bd.ID = #{deviceId}
 
     </select>
+
+
+    <select id="selectDept3List" resultType="map">
+        SELECT WELL_NAME AS wellName, WELL_CODE AS wellCode, ORG_CODE, ORG_NAME AS areaName3,PARENT_ID
+        FROM bus_sync_well_info a
+                 LEFT JOIN
+             bus_sync_org_relation b ON a.RESPONSIBLE_DEPT = b.ORG_CODE
+        WHERE b.`ORG_TYPE` = 4
+    </select>
+    <select id="selectArea3List" resultType="map">
+        SELECT org_id,org_name as deptName3
+        FROM bus_sync_org_relation t
+        WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
+    </select>
 </mapper>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3a34d79..4a95d42 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -128,8 +128,10 @@
             <![CDATA[ and ar.ALARM_TIME <= #{endTime} ]]>
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and ( ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            or bd.devcode like concat('%',CONCAT(#{keywords},'%')))
         </if>
+
         <if test="wellName!='' and wellName!=null">
             and bwi.WELL_NAME like concat('%',CONCAT(#{wellName},'%'))
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index d01bbd5..04f9892 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -79,4 +79,8 @@
     void updateAllJobGenerationType(String jobGenerationType);
 
     Map<String,Object> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
+
+    List<Map<String,String>> selectDept3List();
+
+    List<Map<String,String>> selectArea3List();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index ef1a9a9..2bc9dfd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -968,4 +968,18 @@
           and bd.ID = #{deviceId}
 
     </select>
+
+
+    <select id="selectDept3List" resultType="map">
+        SELECT WELL_NAME AS wellName, WELL_CODE AS wellCode, ORG_CODE, ORG_NAME AS areaName3,PARENT_ID
+        FROM bus_sync_well_info a
+                 LEFT JOIN
+             bus_sync_org_relation b ON a.RESPONSIBLE_DEPT = b.ORG_CODE
+        WHERE b.`ORG_TYPE` = 4
+    </select>
+    <select id="selectArea3List" resultType="map">
+        SELECT org_id,org_name as deptName3
+        FROM bus_sync_org_relation t
+        WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index fcd5953..e92b4f7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,7 +82,21 @@
      * 设备厂商
      */
     private String manufacture;
-
+    /**
+     * 闸井名称
+     */
+    @Excel(name = "闸井名称", orderNum = "9")
+    private String wellName;
+    /**
+     * 班组名称
+     */
+    @Excel(name = "分管班组", orderNum = "10")
+    private String deptName3;
+    /**
+     * 班组名称
+     */
+    @Excel(name = "片区", orderNum = "11")
+    private String areaName3;
     @Override
     protected Serializable pkVal() {
         return null;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3a34d79..4a95d42 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -128,8 +128,10 @@
             <![CDATA[ and ar.ALARM_TIME <= #{endTime} ]]>
         </if>
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and ( ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            or bd.devcode like concat('%',CONCAT(#{keywords},'%')))
         </if>
+
         <if test="wellName!='' and wellName!=null">
             and bwi.WELL_NAME like concat('%',CONCAT(#{wellName},'%'))
         </if>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index d01bbd5..04f9892 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -79,4 +79,8 @@
     void updateAllJobGenerationType(String jobGenerationType);
 
     Map<String,Object> selectDeviceDetail(@Param("deviceId")Serializable deviceId);
+
+    List<Map<String,String>> selectDept3List();
+
+    List<Map<String,String>> selectArea3List();
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index ef1a9a9..2bc9dfd 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -968,4 +968,18 @@
           and bd.ID = #{deviceId}
 
     </select>
+
+
+    <select id="selectDept3List" resultType="map">
+        SELECT WELL_NAME AS wellName, WELL_CODE AS wellCode, ORG_CODE, ORG_NAME AS areaName3,PARENT_ID
+        FROM bus_sync_well_info a
+                 LEFT JOIN
+             bus_sync_org_relation b ON a.RESPONSIBLE_DEPT = b.ORG_CODE
+        WHERE b.`ORG_TYPE` = 4
+    </select>
+    <select id="selectArea3List" resultType="map">
+        SELECT org_id,org_name as deptName3
+        FROM bus_sync_org_relation t
+        WHERE t.org_id IN (SELECT parent_id FROM bus_sync_org_relation WHERE org_type = 4)
+    </select>
 </mapper>
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
index fcd5953..e92b4f7 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java
@@ -82,7 +82,21 @@
      * 设备厂商
      */
     private String manufacture;
-
+    /**
+     * 闸井名称
+     */
+    @Excel(name = "闸井名称", orderNum = "9")
+    private String wellName;
+    /**
+     * 班组名称
+     */
+    @Excel(name = "分管班组", orderNum = "10")
+    private String deptName3;
+    /**
+     * 班组名称
+     */
+    @Excel(name = "片区", orderNum = "11")
+    private String areaName3;
     @Override
     protected Serializable pkVal() {
         return null;
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index 149e7ab..a160d27 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -212,6 +212,10 @@
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, List<Long> deptIds, String isOnline) {
         List<DeviceDto> list = this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, deptIds, isOnline);
+        //加入片区字段
+        List<Map<String, String>> area3List =   this.baseMapper.selectDept3List();
+        //加入班组字段
+        List<Map<String, String>>  dept3List=   this.baseMapper.selectArea3List();
         list.forEach(deviceDto -> {
             deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt()));
             deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState()));
@@ -223,6 +227,17 @@
                 deviceDto.setCompanyName(companyName);
                 deviceDto.setCompanyId(dept.getPid());
             }
+            area3List.forEach(area3->{
+                if(deviceDto.getWellCode().equals(area3.get("wellCode"))){
+                    deviceDto.setAreaName3(area3.get("areaName3"));
+                    deviceDto.setWellName(area3.get("wellName"));
+                    dept3List.forEach(dept3->{
+                        if(area3.get("PARENT_ID").equals(dept3.get("org_id"))){
+                            deviceDto.setDeptName3(dept3.get("deptName3"));
+                        }
+                    });
+                }
+            });
         });
         return list;
     }