基础管理调试

bonus-modules/bonus-base/src/main/java/com/bonus/base/controller/TbTeamController.java

@@ -118,7 +118,7 @@ public class TbTeamController extends BaseController {
     }
 
     /**
-     * 智能安全帽列表查询
+     * 查询安全帽类型设备列表
      *
      * @return 查询结果
      */

bonus-modules/bonus-base/src/main/java/com/bonus/base/mapper/TbTeamMapper.java

@@ -103,7 +103,7 @@ public interface TbTeamMapper {
     int remove(Long id);
 
     /**
-     * 查询设备列表
+     * 查询安全帽类型设备列表
      * @param tbDeviceVo
      * @return
      */

bonus-modules/bonus-base/src/main/java/com/bonus/base/service/TbTeamService.java

@@ -79,7 +79,7 @@ public interface TbTeamService {
     AjaxResult remove(TbTeam tbTeam);
 
     /**
-     * 智能安全帽列表查询
+     * 查询安全帽类型设备列表
      * @param tbDeviceVo
      * @return
      */

bonus-modules/bonus-base/src/main/java/com/bonus/base/service/impl/TbTeamServiceImpl.java

@@ -234,7 +234,7 @@ public class TbTeamServiceImpl implements TbTeamService {
     }
 
     /**
-     * 智能安全帽列表查询
+     * 查询安全帽类型设备列表
      * @return
      */
     @Override

bonus-modules/bonus-base/src/main/resources/mapper/base/TbBdDeviceRecordMapper.xml

@@ -211,12 +211,41 @@
     select
     <include refid="Base_Column_List"/>
     from tb_bd_device_record
-    where
+    where 1=1
     <if test="devName != null and devName != ''">
-      dev_name = #{devName}
+      and dev_name = #{devName}
     </if>
     <if test="devCode != null and devCode != ''">
       and dev_code = #{devCode}
     </if>
   </select>
+
+    <select id="getDeviceList" resultType="com.bonus.base.vo.TbBdDeviceVo">
+      select
+      a.id as id,
+      b.depart_id as departId,
+      b.depart_name as departName,
+      b.pro_id as proId,
+      b.pro_name as proName,
+      a.area_name as areaName,
+      a.dev_name as devName,
+      a.dev_code as devCode,
+      a.dev_user as devUser,
+      a.dev_user_phone as devUserPhone
+      from tb_bd_device_record a
+      left join tb_bd_record b on a.record_id = b.id and b.del_flag = '0'
+      where 1=1
+      <if test="proName != null and proName != ''">
+        and b.pro_name like concat('%',#{proName},'%')
+      </if>
+      <if test="departName != null and departName != ''">
+        and b.depart_name like concat('%',#{departName},'%')
+      </if>
+      <if test="devName != null and devName != ''">
+        and a.dev_name like concat('%',#{devName},'%')
+      </if>
+      <if test="devCode != null and devCode != ''">
+        and a.dev_code like concat('%',#{devCode},'%')
+      </if>
+    </select>
 </mapper>

bonus-modules/bonus-base/src/main/resources/mapper/base/TbTeamMapper.xml

@@ -65,7 +65,7 @@
                td.dev_type as devType,
                td.dev_code as devCode
         from tb_device td
-        where td.del_flag = '0'
+        where td.del_flag = '0' and td.dev_type = '123'
         AND NOT EXISTS(SELECT 1 FROM tb_people tp WHERE tp.dev_id = td.id AND tp.del_flag = '0')
         <if test="keyWord != null and keyWord != ''">
             AND (