소스 검색

闲置土地认定处理添加

gushoubang 9 달 전
부모
커밋
6a866687a3

+ 49 - 0
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/config/StringListTypeHandler.java

@@ -0,0 +1,49 @@
+package com.onemap.apply.config;
+
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+
+import java.sql.*;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 字符串列表类型处理器
+ */
+public class StringListTypeHandler extends BaseTypeHandler<List<String>> {
+
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, List<String> parameter, JdbcType jdbcType) throws SQLException {
+        // 将 List<String> 转换为 PostgreSQL 数组类型
+        Connection conn = ps.getConnection();
+        Array array = conn.createArrayOf("text", parameter.toArray());
+        ps.setArray(i, array);
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, String columnName) throws SQLException {
+        Array array = rs.getArray(columnName);
+        if (array != null) {
+            return Arrays.asList((String[]) array.getArray());
+        }
+        return null;
+    }
+
+    @Override
+    public List<String> getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        Array array = rs.getArray(columnIndex);
+        if (array != null) {
+            return Arrays.asList((String[]) array.getArray());
+        }
+        return null;
+    }
+
+    @Override
+    public List<String> getNullableResult(CallableStatement cs, int columnIndex) throws SQLException {
+        Array array = cs.getArray(columnIndex);
+        if (array != null) {
+            return Arrays.asList((String[]) array.getArray());
+        }
+        return null;
+    }
+}

+ 2 - 1
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/dto/LandIdleConfirmDTO.java

@@ -2,6 +2,7 @@ package com.onemap.apply.domain.tdgy.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.onemap.apply.config.StringListTypeHandler;
 import lombok.Data;
 
 import java.util.Date;
@@ -36,6 +37,6 @@ public class LandIdleConfirmDTO {
     @TableField("confirm_doc")
     private String confirmDoc;
     // 认定照片
-    @TableField("confirm_imgs")
+    @TableField(value = "confirm_imgs", typeHandler = StringListTypeHandler.class)
     private List<String> confirmImgs;
 }

+ 3 - 2
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/dto/LandIdleDisposalDTO.java

@@ -2,6 +2,7 @@ package com.onemap.apply.domain.tdgy.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.onemap.apply.config.StringListTypeHandler;
 import lombok.Data;
 
 import java.util.Date;
@@ -19,7 +20,7 @@ public class LandIdleDisposalDTO {
     private String landId;
     //  是否处置
     @TableField("is_disposal")
-    private String isDisposal;
+    private Boolean isDisposal;
     // 处置时间
     @TableField("disposal_time")
     private Date disposalTime;
@@ -33,6 +34,6 @@ public class LandIdleDisposalDTO {
     @TableField("disposal_doc")
     private String disposalDoc;
     // 处置照片
-    @TableField("disposal_imgs")
+    @TableField(value = "disposal_imgs", typeHandler = StringListTypeHandler.class)
     private List<String> disposalImgs;
 }

+ 1 - 1
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/vo/LandIdleConfirmVo.java

@@ -26,5 +26,5 @@ public class LandIdleConfirmVo {
     // 认定书
     private String confirmDoc;
     // 认定照片
-    private List<String> confirmImgList;
+    private List<String> confirmImgs;
 }

+ 2 - 2
onemap-modules/onemap-apply/src/main/java/com/onemap/apply/domain/tdgy/vo/LandIdleDisposalVo.java

@@ -13,7 +13,7 @@ public class LandIdleDisposalVo {
     @NotNull(message = "土地id不能为空")
     private String landId;
     //  是否处置
-    private String isDisposal;
+    private Boolean isDisposal;
     // 处置时间
     @JsonFormat(pattern = "yyyy/MM/dd")
     private Date disposalTime;
@@ -24,5 +24,5 @@ public class LandIdleDisposalVo {
     // 处置书
     private String disposalDoc;
     // 处置照片
-    private List<String> disposalImgList;
+    private List<String> disposalImgs;
 }