预览线增加gis查询

src/main/resources/mapper/GisSurveyLayerApplyThirdCopyMapper.xml

@@ -114,9 +114,16 @@
         pvtc.property as property_property, pvtc.code as property_code, pvtc.job_id as property_job_id,
         pvtc.value as property_value
         from (
-        select code, job_id, layer, kind, gis, apply, source, up_node, down_node, elevation, depth, no
-        from k3_gis_survey_layer_apply_third_copy
-        where job_id = #{jobId,jdbcType=VARCHAR}
+        select la.code, la.job_id, la.layer, la.kind, la.apply, la.source, la.up_node, la.down_node,
+        la.elevation, la.depth, la.no,
+        case when un.code is not null and dn.code is not null then concat('[', un.gis, ',', dn.gis, ']') else la.gis end
+        as gis
+        from k3_gis_survey_layer_apply_third_copy la
+        left join k3_gis_survey_layer_apply_third_copy as un
+        on la.up_node = un.code and un.kind = 'point' and la.job_id = un.job_id
+        left join k3_gis_survey_layer_apply_third_copy as dn
+        on la.down_node = dn.code and dn.kind = 'point' and la.job_id = dn.job_id
+        where la.job_id = #{jobId,jdbcType=VARCHAR}
         limit #{pageable.pageSize} offset #{pageable.offset}
         ) latc
         left join k3_gis_survey_property_value_third_copy pvtc on latc.code = pvtc.code and latc.job_id = pvtc.job_id