jfpt-BladeX.git

			@@ -180,7 +180,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.id,a.alarmType,a.alarmPeople,a.alarmTime,a.galarmPeople,a.sex,a.phoneNumber,a.content,a.waringType,a.bz,
			a.deviceNumber,a.region,a.district,a.vaddress,a.aaddress,
			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,
			@@ -189,6 +189,7 @@
			e.twoId,
			e.threeId,
			e.deptId,
			e.street as place,
			e.channelNumber from sys_alarm a
			LEFT JOIN
			sys_equipment e on e.deviceNumber=a.deviceNumber
			@@ -397,7 +398,7 @@


			<update id="updateJtype">
			update sys_alarm SET jtype=#{jtype},bz=#{bz} where id=#{id}
			update sys_alarm SET jtype=#{jtype},bz=#{bz},securityArr =#{securityArr} where id=#{id}
			</update>

			<update id="updatePoliceStatus">