区域 增加 镇村选项

xufenglei

2018-06-12 245ab3bcc323dbcc877f8d49fb725b2eec91e118

 src/main/resources/mapper/HistoryMinutelyMapper.xml

@@ -13,7 +13,20 @@
      FROM

         history_minutely

      WHERE

         mac = #{mac}

         mac IN

            (SELECT

               d.mac 
            FROM

               device d

            WHERE

               d.is_delete = 0 
               <if test="monitorPointId != null">

               AND d.monitor_point_id = #{monitorPointId}

               </if>

               <if test="mac != null">

               AND d.mac = #{mac}

               </if>

            )	
      AND time >= #{start}

      AND time &lt; #{end}

   </select>