jfpt-BladeX.git

			@@ -42,6 +42,7 @@
			<result column="baphone" property="baphone"/>
			<result column="manufacturers" property="manufacturers"/>
			<result column="alarmlb" property="alarmlb"/>
			<result column="alarmbs" property="alarmbs"/>
			</resultMap>

			<!-- 通用查询映射结果 -->
			@@ -63,6 +64,9 @@
			<sql id="alarmCondition">
			<if test="alarm.id!=null">
			and a.id = #{alarm.id}
			</if>
			<if test="alarm.alarmbs!=null">
			and a.alarmbs = #{alarm.alarmbs}
			</if>
			<if test="alarm.jtype!=null">
			and a.jtype like concat('%',#{alarm.jtype},'%')
			@@ -210,7 +214,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,e.district,a.vaddress,a.aaddress,
			a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,e.province,e.city,a.cid,
			a.securityArr,a.securityId,a.alarmlb,
			a.securityArr,a.securityId,a.alarmlb,a.alarmbs,
			e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
			e.stype,
			e.oneId,
			@@ -440,10 +444,14 @@
			,bz=#{bz}
			</if>

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

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

			where id=#{id}
			</update>