增加 省市区 查询条件

xufenglei

2018-03-30 9b33e93fccddea356c3d686684fc58ceb176ff39

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -34,10 +34,26 @@
      </if>

      <if test="mac == null">

      AND   h.mac IN

         <foreach  collection="macs" open="(" separator="," close=")" item="listItem">

            #{listItem}

         </foreach>

		
         (SELECT

            d.mac 
         FROM

            device d,

            monitor_point mp 
         WHERE

            d.monitor_point_id = mp.id 
            <if test="provinceCode != null">

            AND mp.province_code = #{provinceCode}

            </if>

            <if test="cityCode != null">

            AND mp.city_code = #{cityCode}

            </if>

            <if test="areaCode != null">

            AND mp.area_code = #{areaCode}

            </if>

            <if test="monitorPointId != null">

            AND mp.id =   #{monitorPointId}

            </if>

         )	
      </if>

      

      GROUP BY