汇交文件生成

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/NodeAttachmentController.java

@@ -350,10 +350,10 @@ public class NodeAttachmentController extends BaseController {
 
             //这里先修改供地类型，再删除原有附件信息，增加新附件信息 （修复附件上传错误）
             TdgyUpdateVo updateVo = new TdgyUpdateVo();
-            gdType= "1".equals(gdType) ? "出让" : "2".equals(gdType)? "划拨":"出让";
+            String gdTypeStr = "1".equals(gdType) ? "出让" : "2".equals(gdType)? "划拨":"出让";
 
             updateVo.setId(nodeId);
-            updateVo.setGdType(gdType);
+            updateVo.setGdType(gdTypeStr);
             tdgyService.update(updateVo);
 
             if (Objects.nonNull(tdgyRes)) {

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/cadastre/CadastreManageController.java

@@ -309,17 +309,20 @@ public class CadastreManageController extends BaseController {
             if(StringUtils.isNotBlank(bdcdyh)){
                 ywh +=  " AND bdcdyh like '%" + bdcdyh + "%'";
             }
-            if(StringUtils.isNotBlank(zl) && "zrz".equalsIgnoreCase(tableName)){
+
+            if(StringUtils.isNotBlank(zl)){
+                if("zrz".equalsIgnoreCase(tableName)){
                     ywh +=  " AND lzzl like '%" + zl + "%'";
-            }else {
+                }else{
                     ywh +=  " AND zl like '%" + zl + "%'";
+                }
             }
             if (StringUtils.isNotBlank(cxfw)) {
                 if (!cxfw.contains("SRID=")) {
                     cxfw = "SRID=" + "4326" + ";" + cxfw;
                 }
                 //todo 这里根据不同的表使用图形查询交集，然后获取bsm，拼接ywh
-                ywh += " AND public.st_intersects(geom,public.st_geomfromewkt("+cxfw+"))";
+                ywh += " AND public.st_intersects(geom,public.st_geomfromewkt('"+cxfw+"'))";
             }
             List<Map<String, Object>> res = cadastreManageService.selectTableRow(tableName, geomFlag, bsm, ywh);
             return R.ok(res);

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/utils/MdbUtil.java

@@ -93,17 +93,16 @@ public class MdbUtil {
                             Object value = row.get(colName);
                             
                             int jdbcType = mapPostgresToJdbcType(pgType);
-                            logger.info("aaaa-Setting value for column: {}, PostgreSQL type: {}, JDBC type: {}, value: {}", colName, pgType, jdbcType, value);
+                            
                             if (value == null) {
                                 pstmt.setNull(i + 1, jdbcType);
                                 continue;
                             }
 
-                            // 处理特殊类型，如 geometry 存为文本
+                            String mdbType = mapPostgresToMdbType(pgType);
                             if (value.toString().contains("SRID")) {
                                 pstmt.setObject(i + 1, value.toString());
                             } else if (pgType.toLowerCase().contains("bytea")) {
-                                // bytea类型需要特殊处理，转换为Base64字符串
                                 if (value instanceof byte[]) {
                                     byte[] bytes = (byte[]) value;
                                     pstmt.setObject(i + 1, Base64.getEncoder().encodeToString(bytes));
@@ -117,33 +116,29 @@ public class MdbUtil {
                                 } else {
                                     pstmt.setObject(i + 1, value.toString());
                                 }
-                                // 如果是数值类型，且值是字符串（可能是空字符串），尝试转换
-                                String mdbType = mapPostgresToMdbType(pgType);
-                                if (("INTEGER".equals(mdbType) || "DOUBLE".equals(mdbType)) && value instanceof String) {
-                                    String strVal = (String) value;
-                                    if (StringUtils.isEmpty(strVal)) {
-                                        pstmt.setNull(i + 1, jdbcType);
-                                    } else {
-                                        try {
-                                            if ("INTEGER".equals(mdbType)) {
-                                                pstmt.setInt(i + 1, Integer.parseInt(strVal));
-                                            } else {
-                                                pstmt.setDouble(i + 1, Double.parseDouble(strVal));
-                                            }
-                                        } catch (NumberFormatException e) {
-                                            pstmt.setNull(i + 1, jdbcType);
+                            } else if (("INTEGER".equals(mdbType) || "DOUBLE".equals(mdbType)) && value instanceof String) {
+                                String strVal = (String) value;
+                                if (StringUtils.isEmpty(strVal)) {
+                                    pstmt.setNull(i + 1, jdbcType);
+                                } else {
+                                    try {
+                                        if ("INTEGER".equals(mdbType)) {
+                                            pstmt.setInt(i + 1, Integer.parseInt(strVal));
+                                        } else {
+                                            pstmt.setDouble(i + 1, Double.parseDouble(strVal));
                                         }
+                                    } catch (NumberFormatException e) {
+                                        pstmt.setNull(i + 1, jdbcType);
                                     }
-                                } else if ("DATETIME".equals(mdbType)) {
-                                    // 确保日期类型正确
-                                    if (value instanceof java.util.Date) {
-                                        pstmt.setTimestamp(i + 1, new java.sql.Timestamp(((java.util.Date) value).getTime()));
-                                    } else {
-                                        pstmt.setObject(i + 1, value, jdbcType);
-                                    }
+                                }
+                            } else if ("DATETIME".equals(mdbType)) {
+                                if (value instanceof java.util.Date) {
+                                    pstmt.setTimestamp(i + 1, new java.sql.Timestamp(((java.util.Date) value).getTime()));
                                 } else {
                                     pstmt.setObject(i + 1, value, jdbcType);
                                 }
+                            } else {
+                                pstmt.setObject(i + 1, value, jdbcType);
                             }
                         }
                         pstmt.addBatch();