diff --git a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml index 033288e8..8144dbf5 100644 --- a/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml @@ -100,7 +100,8 @@ FROM dc_road_section AS s LEFT JOIN ( SELECT mark.section_id, COUNT(1) AS number FROM dc_warning AS w JOIN dc_stake_mark AS mark ON mark.stake_mark = w.stake_mark AND mark.direction = w.direction - WHERE mark.stake_mark IS NOT NULL AND DATE_FORMAT(w.warning_time, '%Y-%m-%d') = DATE_FORMAT(#{warningTime}, '%Y-%m-%d') + WHERE mark.stake_mark IS NOT NULL AND DATE_FORMAT(w.warning_time, '%Y-%m-%d') = DATE_FORMAT(#{warningTime}, '%Y-%m-%d') + and w.warning_source!=6 GROUP BY mark.section_id ) AS w_count ON s.id = w_count.section_id @@ -127,18 +128,18 @@ SELECT HOUR(warning_time) AS time, COUNT(*) AS number FROM dc_warning WHERE MONTH(warning_time) = MONTH(CURDATE()) - AND YEAR(warning_time) = YEAR(CURDATE()) + AND YEAR(warning_time) = YEAR(CURDATE()) and warning_source!=6 GROUP BY HOUR(warning_time) ORDER BY HOUR(warning_time); @@ -169,7 +171,7 @@ ) t1 left join (select HOUR(warning_time) hours,count(*) num from dc_warning t1 - left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark + left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.warning_source!=6 and t1.direction = t2.direction where date_format(warning_time,'%Y-%m-%d') = date_format(#{warningTime},'%Y-%m-%d') and t2.section_id = #{sectionId} and t1.direction=#{direction} and t2.direction=#{direction} @@ -182,7 +184,7 @@ LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark WHERE DATE_FORMAT(warning.warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m') AND warning.direction=#{direction} and mark.direction=#{direction} - and mark.`section_id`=#{sectionId} + and mark.`section_id`=#{sectionId} and warning.warning_source!=6 GROUP BY day ORDER BY day @@ -194,7 +196,7 @@ LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark WHERE QUARTER(warning.warning_time)=#{quarter} AND warning.direction=#{direction} and mark.direction=#{direction} - and mark.`section_id`=#{sectionId} + and mark.`section_id`=#{sectionId} and warning.warning_source!=6 GROUP BY MONTH ORDER BY MONTH; @@ -209,7 +211,7 @@ (select month(warning_time) hours,count(*) num from dc_warning t1 left join dc_stake_mark t2 on t1.stake_mark = t2.stake_mark and t1.direction = t2.direction where DATE_FORMAT(t1.warning_time,'%Y')=DATE_FORMAT(#{warningTime},'%Y') and t2.section_id =#{sectionId} - and t1.direction=#{direction} and t2.direction=#{direction} GROUP BY hours) t2 + and t1.direction=#{direction} and t1.warning_source!=6 and t2.direction=#{direction} GROUP BY hours) t2 on t1.n = t2.hours @@ -235,7 +237,7 @@ LEFT JOIN dc_stake_mark as mark on warning.stake_mark=mark.stake_mark where DATE_FORMAT(warning.warning_time,'%Y-%m') =DATE_FORMAT(#{warningTime},'%Y-%m') AND warning.direction=#{direction} and mark.direction=#{direction} - and mark.`section_id`=#{sectionId} + and mark.`section_id`=#{sectionId} and warning.warning_source!=6 @@ -254,7 +256,7 @@ LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark WHERE QUARTER(warning.warning_time)=#{quarter} AND warning.direction=#{direction} and mark.direction=#{direction} - and mark.`section_id`=#{sectionId} + and mark.`section_id`=#{sectionId} and warning.warning_source!=6 @@ -273,7 +275,7 @@ LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark where mark.`section_id`=#{sectionId} AND warning.direction=#{direction} and mark.direction=#{direction} and DATE_FORMAT(warning.warning_time,'%Y')=DATE_FORMAT(#{warningTime},'%Y') - + and warning.warning_source!=6 @@ -356,7 +359,7 @@