辅助选址面积字段修改

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzJgGisDTO.java

@@ -2,14 +2,16 @@ package com.onemap.analyse.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 @TableName("t_fzss_fzxz_jg_gis")
+@Data
 public class FzxzJgGisDTO {
-    private Integer objectid;
+    // private Integer objectid;
     private String bsm;
     private String rwbsm;
     private String dlb;
@@ -22,109 +24,5 @@ public class FzxzJgGisDTO {
     private String xzqdm;
     private String xzqmc;
     @TableField(exist = false)
-    private List<FzxzJgyzDTO> fxyzjg = new ArrayList<FzxzJgyzDTO>();
-
-    public Integer getObjectid() {
-        return objectid;
-    }
-
-    public void setObjectid(Integer objectid) {
-        this.objectid = objectid;
-    }
-
-    public String getBsm() {
-        return bsm;
-    }
-
-    public void setBsm(String bsm) {
-        this.bsm = bsm;
-    }
-
-    public String getRwbsm() {
-        return rwbsm;
-    }
-
-    public void setRwbsm(String rwbsm) {
-        this.rwbsm = rwbsm;
-    }
-
-    public String getDlb() {
-        return dlb;
-    }
-
-    public void setDlb(String dlb) {
-        this.dlb = dlb;
-    }
-
-    public String getDlbm() {
-        return dlbm;
-    }
-
-    public void setDlbm(String dlbm) {
-        this.dlbm = dlbm;
-    }
-
-    public String getDlmc() {
-        return dlmc;
-    }
-
-    public void setDlmc(String dlmc) {
-        this.dlmc = dlmc;
-    }
-
-    public Date getCjsj() {
-        return cjsj;
-    }
-
-    public void setCjsj(Date cjsj) {
-        this.cjsj = cjsj;
-    }
-
-    public String getYxfa() {
-        return yxfa;
-    }
-
-    public void setYxfa(String yxfa) {
-        this.yxfa = yxfa;
-    }
-
-    public String getBz() {
-        return bz;
-    }
-
-    public void setBz(String bz) {
-        this.bz = bz;
-    }
-
-    public Double getTbmj() {
-        return tbmj;
-    }
-
-    public void setTbmj(Double tbmj) {
-        this.tbmj = tbmj;
-    }
-
-    public String getXzqdm() {
-        return xzqdm;
-    }
-
-    public void setXzqdm(String xzqdm) {
-        this.xzqdm = xzqdm;
-    }
-
-    public String getXzqmc() {
-        return xzqmc;
-    }
-
-    public void setXzqmc(String xzqmc) {
-        this.xzqmc = xzqmc;
-    }
-
-    public List<FzxzJgyzDTO> getFxyzjg() {
-        return fxyzjg;
-    }
-
-    public void setFxyzjg(List<FzxzJgyzDTO> fxyzjg) {
-        this.fxyzjg = fxyzjg;
-    }
+    private List<FzxzJgyzDTO> fxyzjg = new ArrayList<>();
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/domain/FzxzJgyzDTO.java

@@ -2,6 +2,9 @@ package com.onemap.analyse.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 
+/**
+ * 辅助选址结果因子
+ */
 @TableName("t_fzss_fzxz_jgyz")
 public class FzxzJgyzDTO {
     private String bsm;

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/task/FzxzSchedule.java

@@ -822,7 +822,7 @@ public class FzxzSchedule {
         String inShp = fzxzShp;
         List objidlist = new ArrayList<>();
         for (FzxzJgGisDTO cur : fzxzJgGisDTOList) {
-            objidlist.add(cur.getObjectid());
+            // objidlist.add(cur.getObjectid());
         }
         String objids = Joiner.on(",").join(objidlist);
         sde2Shp("KJGH.T_FZSS_FZXZ_JG_GIS", inShp, "\"OBJECTID\" IN (" + objids + ")");

onemap-modules/onemap-analyse/src/main/resources/mapper/oracle/vector/GhdkaMapper.xml

@@ -19,8 +19,8 @@
                 #{id}
             </foreach>
         </if>
-        and shape_area &gt;= ${beginArea}
-        and shape_area &lt;= ${endArea}
+        and ydmj &gt;= ${beginArea}
+        and ydmj &lt;= ${endArea}
     </select>
 
     <select id="getIdByFilter" parameterType="com.onemap.analyse.domain.query.GhdkaFilter"