加上空间信息

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/impl/tdgy/TdgyServiceImp.java

@@ -1,7 +1,6 @@
 package com.onemap.apply.service.impl.tdgy;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.github.dozermapper.core.DozerBeanMapper;
 import com.onemap.apply.domain.tdgy.dto.LandIdleConfirmDTO;
 import com.onemap.apply.domain.tdgy.dto.LandIdleDisposalDTO;
 import com.onemap.apply.domain.tdgy.vo.LandIdleConfirmVo;

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/tdgy/TdgyMapper.xml

@@ -2,19 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.onemap.apply.mapper.tdgy.TdgyMapper">
     <select id="getSuspectedIdleLand" resultType="map">
-        SELECT id, xmmc, crmj, TO_CHAR(ydkgsj, 'yyyy/MM/dd') AS ydkgsj
-        from tdgy_sj
-        WHERE (sfjg!=true or sfjg is null)
-        and (NOW() > ydkgsj) and sfkg!=true
+        SELECT ts.id, ts.xmmc, ts.crmj, TO_CHAR(ts.ydkgsj, 'yyyy/MM/dd') AS ydkgsj,
+        public.st_asewkt(public.st_union(tb.geom)) AS geom
+        FROM tdgy_sj ts
+        LEFT JOIN "TB_TDGY_SJ" tb ON tb.pid = ts.id
+        WHERE (ts.sfjg != true OR ts.sfjg IS NULL)
+        AND (NOW() > ts.ydkgsj)
+        AND ts.sfkg != true
         <if test="key != null and key != ''">
-            and (xmmc like '%'||#{key}||'%' or srf like '%'||#{key}||'%')
+            AND (ts.xmmc LIKE '%' || #{key} || '%' OR ts.srf LIKE '%' || #{key} || '%')
         </if>
         <if test="xzqh != null and xzqh != ''">
-            and xzqh = #{xzqh}
+            AND ts.xzqh = #{xzqh}
         </if>
-        limit #{limit} offset #{offset};
+        GROUP BY ts.id, ts.xmmc, ts.crmj, ts.ydkgsj
+        LIMIT #{limit} OFFSET #{offset};
     </select>
 
+
+
     <select id="getLandGeometry" resultType="String">
         public.st_asewkt(public.st_union(geom))
         from "TB_TDGY_SJ"