jfpt-BladeX.git

			@@ -34,9 +34,14 @@
			<result column="vaddress" property="vaddress"/>
			<result column="aaddress" property="aaddress"/>
			<result column="uids" property="uids"/>
			<result column="securityArr" property="securityArr"/>
			<result column="securityId" property="securityId"/>
			</resultMap>

			<sql id="alarmCondition">
			<if test="alarm.id!=null">
			and a.id = #{alarm.id}
			</if>
			<if test="alarm.jtype!=null">
			and a.jtype like concat('%',#{alarm.jtype},'%')
			</if>
			@@ -183,6 +188,7 @@
			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,
			a.securityArr,a.securityId,
			e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
			e.stype,
			e.oneId,
			@@ -398,7 +404,11 @@


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

			<if test="bz!=null and bz!=''">
			,bz=#{bz}
			</if>

			<if test="securityArr!=null and id!=''">
			,securityArr =#{securityArr}
			@@ -598,8 +608,16 @@
			sys_alarm a
			LEFT JOIN sys_equipment e ON e.deviceNumber = a.deviceNumber
			WHERE
			securityId IS NULL
			AND securityArr LIKE concat('%',#{alarm.securityArr},'%')

			<if test="alarm.securityArr!=null and alarm.securityArr!=''">
			securityId IS NULL
			AND securityArr LIKE concat('%',#{alarm.securityArr},'%')
			</if>

			<if test="alarm.id!=null and alarm.id!=''">
			a.id = #{alarm.id}
			</if>


			</select>