jfpt-BladeX.git

			@@ -39,7 +39,7 @@
			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,
			e.serialNumber,
			e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,onePhone,twoPhone,ThreePhone,
			e.stype,
			e.channelNumber from sys_alarm a
			LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
			@@ -191,6 +191,8 @@
			a.deviceNumber,
			a.region,
			a.district,
			a.province,
			a.city,
			a.alarmId,
			a.rname,
			a.LEVEL,
			@@ -312,12 +314,31 @@
			</select>


			<!-- <!–查询本日，本周，本月主动报警的数量–>-->
			<!-- <select id="selectAlarmSum" resultType="java.util.HashMap">-->
			<!-- select sa.alarmType name,IFNULL(sb.count, 0) value from (select alarmType from sys_alarm GROUP BY alarmType) sa-->
			<!-- left join-->
			<!-- ( select alarmType,count(*) count from sys_alarm-->
			<!-- where 1=1-->
			<!-- <if test="conditionVo.status==0">-->
			<!-- and to_days(alarmTime) = to_days(now())-->
			<!-- </if>-->
			<!-- <if test="conditionVo.status==1">-->
			<!-- and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)-->
			<!-- </if>-->
			<!-- <if test="conditionVo.status==2">-->
			<!-- and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')-->
			<!-- </if>-->
			<!-- group by alarmType-->
			<!-- ) sb-->
			<!-- on-->
			<!-- sa.alarmType = sb.alarmType-->
			<!-- </select>-->

			<!--查询本日，本周，本月主动报警的数量-->
			<select id="selectAlarmSum" resultType="java.util.HashMap">
			select sa.alarmType name,IFNULL(sb.count, 0) value from (select alarmType from sys_alarm GROUP BY alarmType) sa
			left join
			( select alarmType,count(*) count from sys_alarm
			where 1=1
			select '一键求助' name,ifnull(count(*),0 ) value from sys_alarm
			where alarmType = '一键求助'
			<if test="conditionVo.status==0">
			and to_days(alarmTime) = to_days(now())
			</if>
			@@ -327,10 +348,19 @@
			<if test="conditionVo.status==2">
			and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')
			</if>
			group by alarmType
			) sb
			on
			sa.alarmType = sb.alarmType
			union all
			select '电话报警' name,ifnull(count(*),0 ) value from sys_alarm
			where alarmType = '电话报警'
			<if test="conditionVo.status==0">
			and to_days(alarmTime) = to_days(now())
			</if>
			<if test="conditionVo.status==1">
			and YEARWEEK(date_format(alarmTime,'%Y-%m-%d'),1) = YEARWEEK(now(),1)
			</if>
			<if test="conditionVo.status==2">
			and date_format(alarmTime,'%Y%m') = date_format(now(),'%Y%m')
			</if>

			</select>

			<select id="queryPolice" resultType="java.util.List">