Merge branch 'master' into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/config/fzss/HgxfxDTO.java

@@ -23,6 +23,8 @@ public class HgxfxDTO {
     private Date cjsj;
     @TableField(exist = false)
     private List<HgxfxScxRwDTO> scxList;
+    @TableField(exist = false)
+    private String geom;
 
     public String getBsm() {
         return bsm;
@@ -135,4 +137,12 @@ public class HgxfxDTO {
     public void setScxList(List<HgxfxScxRwDTO> scxList) {
         this.scxList = scxList;
     }
+
+    public String getGeom() {
+        return geom;
+    }
+
+    public void setGeom(String geom) {
+        this.geom = geom;
+    }
 }

onemap-modules/onemap-apply/src/main/resources/mapper/postgresql/fzss/HgxfxMapper.xml

@@ -14,7 +14,11 @@
         t.ydxz_bsm as "ydxz_bsm",
         t.fxbg as "fxbg",
         t.rwzt as "rwzt",
-        t.cjsj as "cjsj" from t_fzss_hgxfx t where 1 = 1
+        t.cjsj as "cjsj",
+        public.st_asewkt(t1.geom) AS geom
+        from t_fzss_hgxfx t
+        left join t_fzss_zhxz_file t1 on t1.id = t.xzfw
+        where 1 = 1
         <if test="kssj != null and kssj != ''">
             and t.cjsj &gt;= to_date(#{kssj}, 'yyyy-MM-dd hh24:mi:ss')
         </if>