jfpt-BladeX.git

			@@ -36,7 +36,7 @@

			<select id="selectAlarmPage" resultMap="alarmResultMap">
			select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
			a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
			a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
			e.serialNumber,
			e.stype,
			e.channelNumber from sys_alarm a
			@@ -72,6 +72,9 @@
			<if test="alarm.endTime!=null and alarm.endTime!=''">
			and a.alarmTime<=#{alarm.endTime}
			</if>

			and a.waringType NOT IN("系统测试","主机重新上电")

			ORDER BY
			a.jtype ASC,
			a.alarmTime DESC
			@@ -79,8 +82,9 @@

			<select id="listAll" resultMap="alarmResultMap">
			select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
			a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,a.jd,a.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid
			from sys_alarm a
			a.deviceNumber,a.region,a.district, a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid
			from sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber

			</select>

			<select id="selectList" resultMap="alarmResultMap">
			@@ -256,7 +260,7 @@
			jfpth.blade_region.`name` as addvnm
			FROM
			sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber LEFT JOIN jfpth.blade_region on jfpth.blade_region.`code`=a.district where
			DATE_FORMAT(alarmTime,'%Y-%m-%d') >=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') <=#{endTime} ORDER BY alarmTime desc
			DATE_FORMAT(alarmTime,'%Y-%m-%d') >=#{beginTime} and DATE_FORMAT(alarmTime,'%Y-%m-%d') <=#{endTime} and a.waringType NOT IN("系统测试","主机重新上电") ORDER BY alarmTime desc
			</select>