修改告警存入字段

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

@@ -67,7 +67,7 @@
             s.`name` AS devicename,
             sal.equipment_specific_code AS partid,
             sal.equipment_specific_name AS partname,
-            s.`system_type_code` AS type,
+            '高级应用' AS type,
             IF
             ( sal.confirm_type = 'FIREALARM', 0, 1 ) AS eventlevel,
             CONCAT(IF(a.`name` IS NOT NULL, CONCAT('位于', a.`name`, '的'), ''), sal.equipment_specific_name, '在',  sal.create_date, '发生', sal.equipment_specific_index_name, '事件，请相关人员进行核实确认现场情况！') AS eventdesc,
@@ -139,7 +139,7 @@
             s.`name` AS devicename,
             sal.equipment_specific_code AS partid,
             sal.equipment_specific_name AS partname,
-            s.`system_type_code` AS type,
+            '高级应用' AS type,
             IF
             ( sal.confirm_type = 'FIREALARM', 0, 1 ) AS eventlevel,
             -- CONCAT( sal.equipment_specific_name, ' ', sal.equipment_specific_index_name ) AS eventdesc,

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -34,11 +34,11 @@
 				and a.begin_Time <![CDATA[>=]]> #{beginDate}
 			</if>
 
-			<if test="beginDate=='' and beginDate != null and endDate == ''">
+			<if test="beginDate!='' and beginDate != null and endDate == ''">
 				AND a.begin_Time <![CDATA[>=]]> #{beginDate}
 			</if>
 
-			<if test="endDate=='' and endDate != null and beginDate == ''">
+			<if test="endDate!='' and endDate != null and beginDate == ''">
 				AND a.end_Time <![CDATA[<=]]> #{endDate}
 			</if>