修改选址字段

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

@@ -19,7 +19,8 @@ public class FzxzXzyzDTO {
     // 影响因子名称
     private String yxyzmc;
     // 因子条件,包含：contain,n_contain,相交:identity,n_identity
-    private String spatial_type;
+    @TableField(value = "spatial_type")
+    private String spatialType;
     // 影响值
     private Float yxz;
 }

onemap-modules/onemap-analyse/src/main/java/com/onemap/analyse/service/impl/ReportServiceImpl.java

@@ -153,14 +153,14 @@ public class ReportServiceImpl implements IReportService {
                 FzxzXzyzDTO fzxzXzyzDTO = fzxzXzyzDTOList.get(i);
                 map.put("YXYZMC", fzxzXzyzDTO.getYxyzmc());
                 String yztj = "";
-                if (fzxzXzyzDTO.getSpatial_type() != null) {
-                    if ("contain".equals(fzxzXzyzDTO.getSpatial_type())) {
+                if (fzxzXzyzDTO.getSpatialType() != null) {
+                    if ("contain".equals(fzxzXzyzDTO.getSpatialType())) {
                         yztj = "包含";
-                    } else if ("n_contain".equals(fzxzXzyzDTO.getSpatial_type())) {
+                    } else if ("n_contain".equals(fzxzXzyzDTO.getSpatialType())) {
                         yztj = "不包含";
-                    } else if ("identity".equals(fzxzXzyzDTO.getSpatial_type())) {
+                    } else if ("identity".equals(fzxzXzyzDTO.getSpatialType())) {
                         yztj = "相交";
-                    } else if ("n_identity".equals(fzxzXzyzDTO.getSpatial_type())) {
+                    } else if ("n_identity".equals(fzxzXzyzDTO.getSpatialType())) {
                         yztj = "不相交";
                     }
                 }

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

@@ -45,28 +45,28 @@
         <foreach collection="idList" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
-        <if test="fzxzXzyzDTO.spatial_type == 'contain'">
+        <if test="fzxzXzyzDTO.spatialType == 'contain'">
             AND EXISTS (
             SELECT 1
             FROM "${fzxzXzyzDTO.yzbsm}" as tbName
             WHERE PUBLIC.st_contains(dk.geom, tbName.geom)
             )
         </if>
-        <if test="fzxzXzyzDTO.spatial_type == 'n_contain'">
+        <if test="fzxzXzyzDTO.spatialType == 'n_contain'">
             AND NOT EXISTS (
             SELECT 1
             FROM "${fzxzXzyzDTO.yzbsm}" as tbName
             WHERE PUBLIC.st_contains(dk.geom, tbName.geom)
             )
         </if>
-        <if test="fzxzXzyzDTO.spatial_type == 'identity'">
+        <if test="fzxzXzyzDTO.spatialType == 'identity'">
             AND EXISTS (
             SELECT 1
             FROM "${fzxzXzyzDTO.yzbsm}" as tbName
             WHERE public.st_intersects (dk.geom, tbName.geom)
             )
         </if>
-        <if test="fzxzXzyzDTO.spatial_type == 'n_identity'">
+        <if test="fzxzXzyzDTO.spatialType == 'n_identity'">
             AND NOT EXISTS (
             SELECT 1
             FROM "${fzxzXzyzDTO.yzbsm}" as tbName