Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/raster/AnalyseUtilsDBMapper.xml

@@ -43,10 +43,17 @@
     </select>
 
     <select id="intersectionTableWkt" resultType="java.util.Map">
-        SELECT ret_tab.id,public.st_asewkt(ret_tab.ret_geom_vv) geom,public.st_area(ret_tab.ret_geom_vv) geom_area
+        SELECT ret_tab.id,public.st_asewkt(public.st_transform(ret_tab.ret_geom_vv,4326)) geom,public.st_area(ret_tab.ret_geom_vv) geom_area
         <if test="outputColumn != null and outputColumn.size()>0 ">
             <foreach collection="outputColumn" item="columnValue" open="," separator=",">
-                "${columnValue}"
+                <choose>
+                    <when test="columnValue =='geom'">
+                        public.st_asewkt(geom) geom1
+                    </when>
+                    <otherwise>
+                        "${columnValue}"
+                    </otherwise>
+                </choose>
             </foreach>
         </if>
         FROM ( SELECT inTbale.*,