Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -213,7 +213,7 @@
         LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
         ) d
         <where>
-            <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
+            <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
                 d.warehouseStructureName like
                 concat(concat("%",#{param.warehouseStructureName}),"%")
             </if>
@@ -273,7 +273,7 @@
         left join wl_equipment_specific wles ON wlesa.equipment_specific_id = wles.id
         ) d
         <where>
-            <if test="warehouseStructureName != null and warehouseStructureName != ''">and d.warehouseStructureName like
+            <if test="warehouseStructureName != null and warehouseStructureName != ''"> d.warehouseStructureName like
                 concat(concat("%",#{warehouseStructureName}),"%")
             </if>
             <if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
@@ -351,8 +351,8 @@
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
         LEFT JOIN wl_equipment_specific_alarm wlesa ON wlesa.id = wlesal.equipment_specific_alarm_id) d
-        WHERE
-        <if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">and
+        <where>
+        	<if test="param.warehouseStructureName != null and param.warehouseStructureName != ''">
             d.warehouseStructureName like
             concat(concat("%",#{param.warehouseStructureName}),"%")
         </if>
@@ -395,6 +395,7 @@
         <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
             d.type != 'SHIELD'
         </if>
+        </where>
         ORDER BY d.createDate DESC
     </select>
     <select id="getAlarmList" resultType="java.util.HashMap">
@@ -465,7 +466,7 @@
         ) d
         <where>
             <if test="warehouseStructureName != null and warehouseStructureName != ''">
-                and d.warehouseStructureName like
+                 d.warehouseStructureName like
                 concat(concat("%",#{warehouseStructureName}),"%")
             </if>
             <if test="equipCode != null and equipCode != ''">AND d.fireEquipmentCode like
@@ -521,9 +522,8 @@
         LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
         LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
         ) d
-        WHERE 1=1
-        AND d.fireEquipmentName IS NOT NULL
-        AND d.id = #{id}
+        WHERE
+         d.id = #{id}
         AND d.type = #{alarmType}
         ORDER BY d.createDate DESC
     </select>
@@ -560,9 +560,7 @@
             LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
         ) d
         WHERE
-        1 = 1
-        AND d.fireEquipmentName IS NOT NULL
-        AND d.equipmentSpecificId = #{id}
+        d.equipmentSpecificId = #{id}
         AND d.type = #{alarmType}
     </select>
     <select id="getEquipmentAlarmCount" resultType="int">
@@ -583,9 +581,7 @@
             LEFT JOIN wl_equipment_detail wled ON wles.equipment_detail_id = wled.id
             LEFT JOIN wl_equipment we ON wled.equipment_id = we.id
         ) d
-        WHERE
-        d.fireEquipmentName <![CDATA[<>]]> ''
-        AND d.equipmentSpecificId = #{id}
+        WHERE d.equipmentSpecificId = #{id}
         AND d.type = #{alarmType}
     </select>
     <select id="findByTypeAndDate" resultMap="resultMapDto">
@@ -665,7 +661,6 @@
         </where>
         ) d
         <where>
-            d.fireEquipmentName IS NOT NULL
             <choose>
                 <when test="dto.type != null and dto.type != ''">
                     AND d.type = #{dto.type}
@@ -803,7 +798,6 @@
         </where>
         ) d
         <where>
-            d.fireEquipmentName IS NOT NULL
             <choose>
                 <when test="dto.type != null and dto.type != ''">
                     AND d.type = #{dto.type}
@@ -964,7 +958,6 @@
         </where>
         ) d
         <where>
-            d.fireEquipmentName IS NOT NULL
             <choose>
                 <when test="dto.type != null and dto.type != ''">
                     AND d.type = #{dto.type}
@@ -1017,7 +1010,7 @@
         )m
         <where>
             <if test="dto.status != null and dto.status != ''">
-                AND `status`= #{dto.status}
+                `status`= #{dto.status}
             </if>
             <if test="dto.warehouseStructureName != null and dto.warehouseStructureName != ''">
                 AND warehouseStructureName LIKE CONCAT('%', #{dto.warehouseStructureName}, '%' )