Merge branch 'dev' of http://114.244.114.158:8802/siwei/sanya-data-management-back into dev

onemap-modules/onemap-apply/src/main/java/com/onemap/apply/service/gdbh/impl/TGdbhGdServiceImpl.java

@@ -92,9 +92,12 @@ public class TGdbhGdServiceImpl implements ITGdbhGdService {
         return retMap;
     }
 
-
+    //
     @Override
     public Map<String, Object> ntzlbhqk(String sourceyaer, String targetyaer, String xzqhdm, String dlbm) {
+        if (StringUtils.isEmpty(dlbm)) {
+            dlbm = "01";
+        }
         Map<String, Object> d0old = ntzllist(sourceyaer, xzqhdm, dlbm);
         Map<String, Object> d1new = ntzllist(targetyaer, xzqhdm, dlbm);
         BigDecimal d0_mj_m = (BigDecimal) d0old.get("mj_m");

sql/pgsql/0_init.sql

@@ -1,24 +1,2 @@
-20241126
-修改表
-1.apply
-# 本地文件上传
-file:
-  #domain: http://192.168.100.120:9201
-  #path: F:\新建文件夹\TempFile
-  #prefix: /statics
-  domain: http://192.168.60.2:9201
-  path: /onemapfile
-  prefix: /statics
-
-vector.t_gdbh_rw_geom
-2.apply
-spring:
-  data:
-    neo4j:
-      uri: bolt://192.168.60.63:7687
-      username: neo4j
-      password: password
-
-3.添加灾害点的数据信息
-4.base.t_entity_code_table
-6.灾害点-服务需要现场确定打开那个服务
+耕地保护问题修改
+ALTER TABLE base.t_gdbh ALTER COLUMN xzfw TYPE varchar USING xzfw::varchar;