Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-04 71af09a7d35a1146122776bebac8d51c1903beed

 src/main/resources/mapper/AlarmMapper.xml

@@ -75,5 +75,25 @@
      </if>

         

   </select>

	
   <select id="countByTimes"   resultType="java.util.Map">

      select

      <if test="format !=null">

         DATE_FORMAT(time,#{format}) as time,

      </if>

      COUNT(*) as count from alarm

      <where>

         <if test="start != null">

            time >= #{start}

         </if>

         <if test="end != null">

            and time

            <![CDATA[

            <=

            ]]> #{end}

         </if>

      </where>

      <if test="format !=null">

         GROUP BY DATE_FORMAT(time,#{format}) ;

      </if>

   </select>

</mapper>