修改查询卡口点位语句

Signed-off-by: panaichi <1070374300@qq.com>

serviceapi/carapi/src/main/java/com/founder/carapi/mapper/xml/CarInfoMapper.xml

@@ -12,18 +12,32 @@
     </resultMap>
     <!--根据起始经纬度获取卡口点位数据-->
     <select id="getKkInfoByQsJwd" parameterType="java.lang.String" resultType="com.founder.commonutils.carEntity.KkXxResult">
-        select
+     <!--   select
         NAME as deviceMc,
         CODE as deviceCode,
         (select name from sys_dictitem where groupid = 'CODE_XZQH' and code = substr(t.CODE,0,6))||NAME as deviceAddress,
         x as x,
         y as y
-        from tb_zy_kk t    where 1=1
+        from tb_zy_kk
+        where 1=1
         <if test="qsjd!=null and qsjd!='' and qsjd!=null and qsjd!='' and qswd!=null and qswd!='' and jswd!=null and jswd!=''">
             AND x<![CDATA[>=]]>#{qsjd,jdbcType=VARCHAR} AND x<![CDATA[<=]]>#{jsjd,jdbcType=VARCHAR}
             AND y<![CDATA[>=]]>#{qswd,jdbcType=VARCHAR} AND y<![CDATA[<=]]>#{jswd,jdbcType=VARCHAR}
+        </if> -->
+        select
+            SBMC as deviceMc,
+            SBBH as deviceCode,
+            DIC_QHBM as deviceAddress,
+            JD as x,
+            WD as y
+        from
+            tb_m_jj_kkdwxx
+        where
+            1=1
+        <if test="qsjd!=null and qsjd!='' and qsjd!=null and qsjd!='' and qswd!=null and qswd!='' and jswd!=null and jswd!=''">
+            AND JD<![CDATA[>=]]>#{qsjd,jdbcType=VARCHAR} AND JD<![CDATA[<=]]>#{jsjd,jdbcType=VARCHAR}
+            AND WD<![CDATA[>=]]>#{qswd,jdbcType=VARCHAR} AND WD<![CDATA[<=]]>#{jswd,jdbcType=VARCHAR}
         </if>
-
     </select>
     <!--任务 查询结果表-->
     <select id="getAllResult" parameterType="com.founder.commonutils.carEntity.TbStRegionalstaskresult" resultType="com.founder.commonutils.carEntity.TbStRegionalstaskresult">