jfpt-BladeX.git

			@@ -38,7 +38,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.bz,
			a.deviceNumber,a.region,a.district,
			a.deviceNumber,a.region,a.district,a.vaddress,
			a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
			e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
			e.stype,
			@@ -85,7 +85,7 @@

			<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,e.jd,e.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,a.vaddress
			from sys_alarm a LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber

			</select>
			@@ -103,6 +103,7 @@
			a.content,
			a.waringType,
			a.deviceNumber,
			a.vaddress,
			a.region,
			a.district,
			a.alarmId,
			@@ -140,7 +141,7 @@
			</select>

			<select id="getLimit" resultMap="alarmResultMap">
			select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,
			select a.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.place,a.content,a.waringType,a.vaddress,
			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 ORDER BY id DESC LIMIT 1
			</select>

			@@ -162,6 +163,7 @@
			a.region,
			a.district,
			a.alarmId,
			a.vaddress,
			a.rname,
			a.LEVEL,
			a.cid,