调整关于上链报批

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

@@ -13,8 +13,6 @@ import com.siwei.apply.service.cadastre.impl.FzssFxrwrzHandleService;
 import com.siwei.apply.utils.ServiceFileUtil;
 import com.siwei.common.core.domain.R;
 import com.siwei.common.core.utils.StringUtils;
-import com.siwei.common.core.utils.bean.BeanUtils;
-import com.siwei.common.core.utils.poi.ExcelUtil;
 import com.siwei.common.core.web.controller.BaseController;
 import org.apache.commons.collections4.CollectionUtils;
 import org.gdal.ogr.*;

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/ConvergeServiceImpl.java

@@ -243,19 +243,19 @@ public class ConvergeServiceImpl implements ConvergeService {
                     // 行政区
                     if (convergeRes.getTableName().equals(ConvergeTableEnum.TABLE_0.getTableName())) {
                         convergeRes.setFilePath(basePath + "1行政区");
-                        convergeRes.setFileName("01" + ConvergeTableEnum.TABLE_0.getTableName());
+                        convergeRes.setFileName("" + ConvergeTableEnum.TABLE_0.getTableName().toUpperCase(Locale.ROOT));
                     } else if (ConvergeTableEnum.TABLE_1.getTableName().equals(convergeRes.getTableName())) {
                         //地籍区
                         convergeRes.setFilePath(basePath + "2地籍区");
-                        convergeRes.setFileName("02" + ConvergeTableEnum.TABLE_1.getTableName());
+                        convergeRes.setFileName("" + ConvergeTableEnum.TABLE_1.getTableName());
                     } else if (ConvergeTableEnum.TABLE_2.getTableName().equals(convergeRes.getTableName())) {
                         //地籍子区
                         convergeRes.setFilePath(basePath + "3地籍子区");
-                        convergeRes.setFileName("03" + ConvergeTableEnum.TABLE_2.getTableName());
+                        convergeRes.setFileName("" + ConvergeTableEnum.TABLE_2.getTableName());
                     } else if (ConvergeTableEnum.TABLE_3.getTableName().equals(convergeRes.getTableName())) {
                         //宗地
                         convergeRes.setFilePath(basePath + "");
-                        convergeRes.setFileName("03" + ConvergeTableEnum.TABLE_3.getTableName());
+                        convergeRes.setFileName("" + ConvergeTableEnum.TABLE_3.getTableName());
                         //todo 这里需要对宗地，根据情况进行拆分，出来一个新的List
 
                         List<Map<String, Object>> zdList = convergeRes.getDataList();
@@ -283,7 +283,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     BeanUtils.copyProperties(convergeRes, convergeResTmp);
                                     convergeResTmp.setDataList(zd_zjdsyq_ydcydj_list);
                                     convergeResTmp.setFilePath(basePath + "4宅基地使用权和房屋所有权/01已调查已登记/01空间数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ");
                                     convergeResTmp.setType(1);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -316,7 +316,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(new_zd_zjdsyq_ydcydj_list);
 
                                     convergeResTmp.setFilePath(basePath + "4宅基地使用权和房屋所有权/01已调查已登记/02属性数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ");
                                     convergeResTmp.setType(2);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -344,7 +344,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(zd_zjdsyq_ydcwdj_list);
 
                                     convergeResTmp.setFilePath(basePath + "4宅基地使用权和房屋所有权/02已调查未登记/01空间数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq_ydcwdj");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ_YDCWDJ");
                                     convergeResTmp.setType(1);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -374,7 +374,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(new_zd_zjdsyq_ydcwdj_list);
 
                                     convergeResTmp.setFilePath(basePath + "4宅基地使用权和房屋所有权/02已调查未登记/02属性数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq_ydcwdj");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ_YDCWDJ");
                                     convergeResTmp.setType(2);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -412,7 +412,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     BeanUtils.copyProperties(convergeRes, convergeResTmp);
                                     convergeResTmp.setDataList(zd_zjdsyq_ydcydj_list);
                                     convergeResTmp.setFilePath(basePath + "5集体建设用地使用权和房屋所有权/01已调查已登记/01空间数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ");
                                     convergeResTmp.setType(1);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -445,7 +445,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(new_zd_zjdsyq_ydcydj_list);
 
                                     convergeResTmp.setFilePath(basePath + "5集体建设用地使用权和房屋所有权/01已调查已登记/02属性数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ");
                                     convergeResTmp.setType(2);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -471,7 +471,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(zd_zjdsyq_ydcwdj_list);
 
                                     convergeResTmp.setFilePath(basePath + "4宅基地使用权和房屋所有权/02已调查未登记/01空间数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq_ydcwdj");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ_YDCWDJ");
                                     convergeResTmp.setType(1);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -504,7 +504,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(new_zd_zjdsyq_ydcwdj_list);
 
                                     convergeResTmp.setFilePath(basePath + "4宅基地使用权和房屋所有权/02已调查未登记/02属性数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq_ydcwdj");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ_YDCWDJ");
                                     convergeResTmp.setType(2);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -576,7 +576,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(new_zd_zjdsyq_ydcydj_list);
 
                                     convergeResTmp.setFilePath(basePath + "6国有建设用地使用权和房屋所有权/01已调查已登记/02属性数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq");
+                                    convergeResTmp.setFileName("" + "zd_zjdsyq");
                                     convergeResTmp.setType(2);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -603,7 +603,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(zd_zjdsyq_ydcwdj_list);
 
                                     convergeResTmp.setFilePath(basePath + "6国有建设用地使用权和房屋所有权/02已调查未登记/01空间数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq_ydcwdj");
+                                    convergeResTmp.setFileName("" + "ZD_GYJSYDSYQ_YDCWDJ");
                                     convergeResTmp.setType(1);
                                     subConvergeTableList.add(convergeResTmp);
 
@@ -636,7 +636,7 @@ public class ConvergeServiceImpl implements ConvergeService {
                                     convergeResTmp.setDataList(new_zd_zjdsyq_ydcwdj_list);
 
                                     convergeResTmp.setFilePath(basePath + "6国有建设用地使用权和房屋所有权/02已调查未登记/02属性数据");
-                                    convergeResTmp.setFileName("0" + "zd_zjdsyq_ydcwdj");
+                                    convergeResTmp.setFileName("" + "ZD_ZJDSYQ_YDCWDJ");
                                     convergeResTmp.setType(2);
                                     subConvergeTableList.add(convergeResTmp);
 

siwei-modules/siwei-apply/src/main/resources/mapper/NodeLandMapper.xml

@@ -114,7 +114,8 @@
                 LEFT JOIN "public"."t_geom_db"  upload   on geom.upload_id=upload.id
                 LEFT JOIN "public"."t_node_land" node    on  node.geom_db_id=upload.id
                 LEFT JOIN  "public"."t_ydbp_data" ydbp   on  node.node_id=ydbp.id
-                where ydbp.has_onchain=true AND  st_contains(geom.geom, (SELECT geom FROM "t_geom_db_details" WHERE id = #{detailsId}) )
+                where ydbp.has_onchain=true
+                AND  st_contains(ST_Buffer(geom.geom::geography, 0.1)::geometry, (SELECT geom FROM "t_geom_db_details" WHERE id = #{detailsId}) )
                 order by ydbp.created_at desc
                 limit 1
     </select>