修改bug

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

@@ -757,7 +757,7 @@
         wlesa.`status`,
         wlesal.type AS type,
         wlesal.create_date AS createDate,
-        wlesal.location AS warehouseStructureName,
+        CONCAT_WS(' ', wlesal.location,wled.area) AS warehouseStructureName,/*告警列表拼接详细地址*/
         (select
         group_concat(fet.`name`)
         from f_equipment_fire_equipment as fefe
@@ -946,8 +946,8 @@
             </if>
 
             <if test='dto.startDate != null and dto.endDate  != null '>
-                AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d ' ) between DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d ' ) and
-                DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d ' )
+                AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d' ) <![CDATA[>=]]>  DATE_FORMAT(#{dto.startDate}, '%Y-%m-%d' )
+                AND DATE_FORMAT(wlesa.create_date, '%Y-%m-%d' ) <![CDATA[<=]]>  DATE_FORMAT(#{dto.endDate}, '%Y-%m-%d' )
             </if>
 
             <if test="dto.isFirm == 'yes'">